drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,622 Commits 1 Branch 0 Tags
Commit Graph

85622 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
816153b0b2 Merge "Test image for 2 input tests." into jb-mr1-dev 2012-09-24 14:25:21 -07:00
Dianne Hackborn
139748fd72 Fix issue #7215984: java.lang.RuntimeException: Unable to create... 
...service com.android.systemui.SystemUIService: java.lang.NullPointerException

- Don't acquire the activity manager lock in handleIncomingUser(),
  there is really no need to do so.
- Rework the settings provider client side cache code to not hold
  locks while calling into the provider.

I also changed the way the settings provider uses system properties
so that there is one property for all users.  We can't do one per
user, since the system property name space is limited with a fixed
size.  And we don't really need to do that; the worse that happens
by combining all users is that if one running user changes one of its
settings, all other running users will think they need to reload
settings when they go to fetch them next.

Change-Id: I13b90b832310d117eb6d721aacd122cfba7d749a
 2012-09-24 14:15:14 -07:00
Svetoslav Ganov
24e95fc70e am 270a331c: Merge "UI test automation service should not be auto reconnected." into jb-mr1-dev 
* commit '270a331cae1f8179e15c794cf8a359893d5966a1':
  UI test automation service should not be auto reconnected.
 2012-09-24 14:02:54 -07:00
Daniel Sandler
5b2e6757f1 am 598cfcad: Merge "Properly launch quicksettings activities." into jb-mr1-dev 
* commit '598cfcad42c117a05c4a6f3f75c415b1146170d1':
  Properly launch quicksettings activities.
 2012-09-24 14:00:13 -07:00
Svetoslav Ganov
270a331cae Merge "UI test automation service should not be auto reconnected." into jb-mr1-dev 2012-09-24 13:58:22 -07:00
Svetoslav Ganov
657968a65f UI test automation service should not be auto reconnected. 
1. Since adb is restarted on user switch it makes no sense to
   try to reconnect the ui automation service since it will
   be killed on a user switch.

   Disabling touch exploration on UI automation service
   connect since it can explicitly put the device in this
   state if needed.

bug:6967373

Change-Id: I8cfde74f28f3f03d4ccf24746d43b8178ae2b5ef
 2012-09-24 13:50:44 -07:00
Daniel Sandler
598cfcad42 Merge "Properly launch quicksettings activities." into jb-mr1-dev 2012-09-24 13:42:36 -07:00
Bart Sears
3459d1be3c am 4249be40: Merge "Updated versions of DroidSansFallback" into jb-mr1-dev 
* commit '4249be40bd1c51dae37c27f9450ed01f19edcbef':
  Updated versions of DroidSansFallback
 2012-09-24 13:09:51 -07:00
Sara Ting
4d6f90ea50 Adding support for new 'uid2445' column in Calendar's Events table. 
Bug:7029852
Change-Id: I4fdf86ba44f5c7bdcc55e8c2bdf664dddbe671f5
 2012-09-24 13:09:35 -07:00
Bart Sears
4249be40bd Merge "Updated versions of DroidSansFallback" into jb-mr1-dev 2012-09-24 13:06:37 -07:00
Jeff Sharkey
7d8bcb498d Move multi-user OBB under user-specific path. 
Bug: 7212801
Change-Id: I0ab83c1d9cb21914d61a7da45a32e89956e22ec8
 2012-09-24 13:03:35 -07:00
Jason Sams
c4b95cfc7b Test image for 2 input tests. 
bug 7216044

Change-Id: I79794c1b12f618d03b27b316126cab9b3e4c9c38
 2012-09-24 12:54:46 -07:00
Siva Velusamy
c50fbea3f1 am a850f9a1: Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev 
* commit 'a850f9a168e79aa247f7bb39f4f43a4c4b0cff79':
  Do not preload videoeditor_jni since it breaks the emulator
 2012-09-24 12:49:30 -07:00
Siva Velusamy
a850f9a168 Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev 2012-09-24 12:46:15 -07:00
Eino-Ville Talvala
487acdfb4e Camera: Improve enableShutterSound documentation. 
Bug: 7216272
Change-Id: I1b9add715c7d3671472b9f98d9b1d80823109365
 2012-09-24 12:22:16 -07:00
Romain Guy
87e2f757be Add a property to disable libhwui's scissor optimization 
Bug #7158326

When scissor optimization is enabled, OpenGLRenderer will attempt to
minimize the use of scissor by selectively enabling and disabling the
GL scissor test.
When the optimization is disabled, OpenGLRenderer will keep the GL
scissor test enabled and change the scissor rect as needed.
Some GPUs (for instance the SGX 540) perform better when changing
the scissor rect often than when enabling/disabling the scissor test
often.

Change-Id: Idb68862e287a23358f9188d577ae0f86161902fd
 2012-09-24 11:47:52 -07:00
Philip Milne
0014c0f64a am bc391d58: Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev 
* commit 'bc391d58c8d09bd58b57dda20dd9d2281d90db32':
  Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
 2012-09-24 11:43:42 -07:00
Philip Milne
bc391d58c8 Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev 2012-09-24 11:41:53 -07:00
Philip Milne
53fe756772 Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" 
This reverts commit 2f6d8829524dfca3a77e9a57c3b9c3862209877d

Change-Id: Id5af767a09fc319127c4ebef837c5b7a7f75cb01
 2012-09-24 11:38:29 -07:00
Michael Jurka
e93ea88b12 am 9b93f4de: Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev 
* commit '9b93f4def131845200997c861858f34cc15c8dee':
  Fix security check for private allocateAppWidgetId api
 2012-09-24 11:26:55 -07:00
Michael Jurka
9b93f4def1 Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev 2012-09-24 11:24:26 -07:00
Dianne Hackborn
308ac6c6e4 am 7451f15e: Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev 
* commit '7451f15e7464fe8dd117b74c6dcff780785e0007':
  Fix issue #6926562: Ensure all multi-user cache files are managed correctly
 2012-09-24 11:08:46 -07:00
Dianne Hackborn
7451f15e74 Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev 2012-09-24 11:07:26 -07:00
Philip Milne
2eba91d98f am b00df8e9: Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 
* commit 'b00df8e929f9ba865a95a7df3f949e6169332954':
  Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
 2012-09-24 11:05:19 -07:00
Dianne Hackborn
556b09e184 Fix issue #6926562: Ensure all multi-user cache files are managed correctly 
Now we correctly iterate through the different user cache dirs.

Also update documentation to describe the new cache pruning behavior,
and deprecate the file modes for making files world readable/writable
which we really don't want people using any more.

Change-Id: I3708df3ddc697b1f5c511143cce7cc40a5a3d0bd
 2012-09-24 11:02:45 -07:00
Philip Milne
b00df8e929 Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 2012-09-24 11:02:31 -07:00
Dianne Hackborn
dae9f15389 am cd11b223: Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev 
* commit 'cd11b223f3d23ca0f92b53808f7e1cce928c2a7b':
  Fix issue #7214090: Need to be able to post notifications to all users
 2012-09-24 11:00:57 -07:00
Dianne Hackborn
cd11b223f3 Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev 2012-09-24 10:58:20 -07:00
Dianne Hackborn
50cdf7c306 Fix issue #7214090: Need to be able to post notifications to all users 
Also fix a bunch of system services that should be doing this.  And
while doing that, found I needed to fix PendingIntent to evaluate
USER_CURRENT at the point of sending, not creation.

Note that this may end up with us having some notification shown to
non-primary users that lead to settings UI that should only be for
the primary user (such as the vpn notification).  I'm not sure what
to do about this, maybe we need a different UI to come up there or
something, but showing the actual notification for those users at
least seems less broken than not telling them at all.

Change-Id: Iffc51e2d7c847e3d05064d292ab93937646a1ab7
 2012-09-24 10:55:46 -07:00
Siva Velusamy
c0373dfdc1 Do not preload videoeditor_jni since it breaks the emulator 
Video editing is not supported on the emulator, so preloading
this causes the emulator to crash while booting up.

Bug 7200384

Change-Id: I1915d888be328c20aa66ca2318722d5b6e6342b0
 2012-09-24 10:34:42 -07:00
Robert Greenwalt
e7dc94e37c am d5111f25: Merge "Fix the build." into jb-mr1-dev 
* commit 'd5111f252b731396293caedbee929856acd6b276':
  Fix the build.
 2012-09-24 10:16:46 -07:00
Robert Greenwalt
d5111f252b Merge "Fix the build." into jb-mr1-dev 2012-09-24 10:13:57 -07:00
Robert Greenwalt
026efcc0b8 Fix the build. 
Other side of change 229425: add the secure settings used to control
the source country used in premium-sms determination.

bug:7205426
Change-Id: I6c8fece4fdea9aeae72da70c5cbe45807197c7bc
 2012-09-24 10:03:21 -07:00
Alon Albert
3b086c921a am fcf0061e: Merge "Skip operations for users who are not running" into jb-mr1-dev 
* commit 'fcf0061ebf2a56f76f207460b39fb14f25779bfd':
  Skip operations for users who are not running
 2012-09-24 09:56:08 -07:00
Alon Albert
fcf0061ebf Merge "Skip operations for users who are not running" into jb-mr1-dev 2012-09-24 09:53:33 -07:00
Alon Albert
d4b191562d am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev 
* commit '0ff65375683f5d5f05c7e1882f758cc93be57c99':
  Add columns to CalendarContract
 2012-09-24 09:50:10 -07:00
Alon Albert
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -07:00
Amith Yamasani
bbad3f8d2f am 888eb73c: resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
* commit '888eb73c6e86a18520cbaa999a18e8b039dbed4f':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 09:40:49 -07:00
Amith Yamasani
888eb73c6e resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
Change-Id: Ic65395ce932971dc9c37a481aa96da79a45d0f12
 2012-09-24 09:26:37 -07:00
Victoria Lease
a06464b16d am 8658e1aa: Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 
* commit '8658e1aa1fb0905852c4b0f5ae1d96cd2d56b6cf':
  Allow apps to getProviders() without location permissions.
 2012-09-24 09:05:04 -07:00
Victoria Lease
8658e1aa1f Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 2012-09-24 09:02:13 -07:00
The Android Open Source Project
68f62989af am 18fd992b: (-s ours) am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '18fd992b2da203a268e3c1b345c040d36ac3dc84':
  Show plmn in emergency call allowed mode.
  Get your own cursor Drawables, WebViewClassic!
 2012-09-24 08:51:56 -07:00
Kenny Root
ce9dfb82db am c6f8a998: Merge "LockScreen: don\'t update KeyStore password on unlock" into jb-mr1-dev 
* commit 'c6f8a9985b6cdfd770b707b8fdf05c0b1b2809fc':
  LockScreen: don't update KeyStore password on unlock
 2012-09-24 08:51:52 -07:00
Amith Yamasani
814f5ac3a1 am b079d1f2: am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade" 
* commit 'b079d1f28089ad4de05162b7df0ace90bc40a5f3':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 08:49:47 -07:00
John Spurlock
e151c6e804 am 2ce1ae8e: Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev 
* commit '2ce1ae8e63b7ef1b3a4cf7497265db24f6cebcdb':
  Migrate away from lightsOut() in BeanBagDream.
 2012-09-24 08:48:27 -07:00
Jim Miller
fdf326f18c am 26c5686b: Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev 
* commit '26c5686b7e3bf0ba238c55caa3e86447bab7cc61':
  Better handling of multiple touch events in GlowPadView
 2012-09-24 08:48:23 -07:00
Jeff Sharkey
63001c679c am 49397ac9: Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 
* commit '49397ac93ce3cf4fc38d00b1099a6cd9075cee8a':
  Always bind to DefaultContainerService as OWNER.
 2012-09-24 08:48:19 -07:00
Romain Guy
dc33472432 am 6b3292ce: Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev 
* commit '6b3292ce5b3908c7433503f64c852cf2b27718ed':
  Avoid deadlock when deleting layers Bug #7217459
 2012-09-24 08:48:16 -07:00
Irfan Sheriff
c45d6362fd am 916b2b5a: Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 
* commit '916b2b5a932a3be1a1363ac1871e74ad8b314f00':
  Increase WFD connect time out to 60s
 2012-09-24 08:48:10 -07:00
Fabrice Di Meglio
d865a54841 am f7a3e979: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'f7a3e979a7ab3be4715408b6328f27e56a7c9326':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 08:48:06 -07:00