Jeff Brown
7bb89cf163
Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev
...
* changes:
Cure narcolepsy.
Allow applications to connect to known wifi displays.
2012-09-26 20:19:09 -07:00
Jeff Sharkey
f21b94a877
Merge "Remove unused Secure settings." into jb-mr1-dev
2012-09-26 20:17:44 -07:00
Jeff Sharkey
68b7a6d14b
Merge "First step towards cleaning up Global settings." into jb-mr1-dev
2012-09-26 20:15:45 -07:00
Jeff Brown
bc33545746
Allow applications to connect to known wifi displays.
...
Bug: 7177920
Change-Id: I9d8406e1016988e2cd267dfa52d78a829f1b385e
2012-09-26 18:34:47 -07:00
Adam Cohen
3ff2d867d4
Fixing AppWidgetService / AppWidgetHost to work in system process
...
-> Fixes issue 7208464
-> Fixed issue with partial update as well, should address
issue 7214731
Change-Id: Ib8d9d5bee68b4fa7d6b4fbbc2f6609c287689958
2012-09-26 18:00:12 -07:00
Jeff Sharkey
4de9936e85
Remove unused Secure settings.
...
Carefully leave default values intact in Watchdog for now.
Bug: 7232007, 7232230
Change-Id: Id944181109305aed41e0766fdd39625b43cb1d19
2012-09-26 17:58:19 -07:00
Amith Yamasani
e65518fd1d
am f2ecb683: am 38796fe1: Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev
...
* commit 'f2ecb683529a9101c31b489e780a73b8744d19a3':
Fix sync problems when setting up a new user and account
2012-09-26 17:50:05 -07:00
Amith Yamasani
d490f68664
am 38796fe1: Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev
...
* commit '38796fe16266e22c56d2eee3eb63fac0cb926aaa':
Fix sync problems when setting up a new user and account
2012-09-26 17:48:35 -07:00
Amith Yamasani
38796fe162
Merge "Fix sync problems when setting up a new user and account" into jb-mr1-dev
2012-09-26 17:46:37 -07:00
Adam Cohen
a6a4cbc18f
Fixing Keyguard widget click handling (issue 7179972)
...
Change-Id: I2b268d08f5aff403a04db53c357fa45a6cb8d490
2012-09-26 17:43:08 -07:00
Philip Milne
9ac0a9af26
am 2bbc3257: am eed8f06f: Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
...
* commit '2bbc32575fc746026e9cc1dae897754a0ba1dcb7':
Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()
2012-09-26 17:37:02 -07:00
Philip Milne
ac4b97caed
am eed8f06f: Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
...
* commit 'eed8f06f7f5d8f934ea99f16ef987a3ae1bd99b2':
Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()
2012-09-26 17:34:10 -07:00
Philip Milne
eed8f06f7f
Merge "Fix for bug: #7173350 . elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev
2012-09-26 17:30:20 -07:00
Jeff Brown
260f07a713
am f8a752d5: am 0c9bbf4e: Merge "Make DreamManagerService more robust." into jb-mr1-dev
...
* commit 'f8a752d511da2eb96209b75b61dfac039db46498':
Make DreamManagerService more robust.
2012-09-26 17:29:41 -07:00
Jeff Brown
ff7564ca18
am 0c9bbf4e: Merge "Make DreamManagerService more robust." into jb-mr1-dev
...
* commit '0c9bbf4e13f2be6a4b930da2379c77e06a68c2cb':
Make DreamManagerService more robust.
2012-09-26 17:27:11 -07:00
Jeff Brown
0c9bbf4e13
Merge "Make DreamManagerService more robust." into jb-mr1-dev
2012-09-26 17:25:23 -07:00
Adam Powell
6649ae314b
am 221abd23: am 5a864aa0: Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev
...
* commit '221abd23b1b4e8f3139ca675634696ba5360c8b8':
ScaleGestureDetector bugfixes
2012-09-26 17:24:45 -07:00
Adam Powell
d03592587c
am 5a864aa0: Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev
...
* commit '5a864aa0d8919d38b23c9e7e90455181d3a979e3':
ScaleGestureDetector bugfixes
2012-09-26 17:22:23 -07:00
Adam Powell
5a864aa0d8
Merge "ScaleGestureDetector bugfixes" into jb-mr1-dev
2012-09-26 17:20:37 -07:00
Jeff Sharkey
bdfce2ec05
First step towards cleaning up Global settings.
...
Remove all @Deprecated @hide settings, and clean up any stragglers.
Bug: 7232125
Change-Id: Ibf67093c728d4a28565129b923edb1701d3b2789
2012-09-26 17:18:49 -07:00
Adam Powell
abde042a82
ScaleGestureDetector bugfixes
...
* Use radius, not diameter.
* Properly determine initial span on ACTION_DOWN.
Change-Id: Ia1dcff6589f8226181a9beaecef34440e9e16330
2012-09-26 17:12:50 -07:00
Brian Carlstrom
b66e30373c
am 0b6cb84b: am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
...
* commit '0b6cb84b909c40ceeb37cbcf2ce82a2b0129be7a':
Reverting public setSoWriteTimeout
2012-09-26 16:09:29 -07:00
Brian Carlstrom
cd4a962a84
am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
...
* commit '13987fb43255ccb3802d415e32b1c5caf14291bb':
Reverting public setSoWriteTimeout
2012-09-26 16:09:03 -07:00
Dianne Hackborn
574fbc738d
am c73f3d5c: am 7b879999: Merge "Fix issue #7238170 : Edit picture option is not available for the secondary user." into jb-mr1-dev
...
* commit 'c73f3d5cea18b1688a119658680b489ef7621dd2':
Fix issue #7238170 : Edit picture option is not available for the secondary user.
2012-09-26 16:07:44 -07:00
Dianne Hackborn
a5731c7fad
am 7b879999: Merge "Fix issue #7238170 : Edit picture option is not available for the secondary user." into jb-mr1-dev
...
* commit '7b879999fe2bef549ed1c04259fcd7f07e10e83b':
Fix issue #7238170 : Edit picture option is not available for the secondary user.
2012-09-26 16:07:14 -07:00
Brian Carlstrom
13987fb432
Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
2012-09-26 16:05:00 -07:00
Dianne Hackborn
7b879999fe
Merge "Fix issue #7238170 : Edit picture option is not available for the secondary user." into jb-mr1-dev
2012-09-26 16:03:06 -07:00
Brian Carlstrom
992f238d13
Reverting public setSoWriteTimeout
...
This reverts fd901f735c and 5e21bf934b
Bug: 7237764
Bug: 6693087
Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
2012-09-26 15:48:21 -07:00
Adam Powell
3cc8211ecd
am cbc289ae: am bf184875: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev
...
* commit 'cbc289ae0c15a70eb6b4b611b23761159059f153':
Fix adjustViewBounds handling for ImageView
2012-09-26 15:32:55 -07:00
Adam Powell
cf382a9971
am bf184875: Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev
...
* commit 'bf184875ef4dc41024474840641c6fc9d3a9e975':
Fix adjustViewBounds handling for ImageView
2012-09-26 15:30:54 -07:00
Adam Powell
bf184875ef
Merge "Fix adjustViewBounds handling for ImageView" into jb-mr1-dev
2012-09-26 15:28:52 -07:00
Jeff Brown
62c82e4d92
Make DreamManagerService more robust.
...
Clearly isolated the DreamManagerService and DreamController
responsibilities. DreamManagerService contains just enough logic to
manage the global synchronous behaviors. All of the asynchronous
behaviors are in DreamController.
Added a new PowerManager function called nap() to request the device
to start napping. If it is a good time to nap, then the
PowerManagerService will call startDream() on the DreamManagerService
to start dreaming.
Fixed a possible multi-user issue by explicitly tracking for
which user a dream service is being started and stopping dreams
when the current user changes. The user id is also passed to
bindService() to ensure that the dream has the right environment.
Fix interactions with docks and the UI mode manager. It is
important that we always send the ACTION_DOCK_EVENT broadcast
to the system so that it can configure audio routing and the like.
When docked, the UI mode manager starts a dock app if there is
one, otherwise it starts a dream.
This change resolves issues with dreams started for reasons other
than a user activity timeout.
Bug: 7204211
Change-Id: I3193cc8190982c0836319176fa2e9c4dcad9c01f
2012-09-26 15:24:27 -07:00
Adam Powell
b1271ac183
Fix adjustViewBounds handling for ImageView
...
When computing the adjusted view bounds, don't constrain the
dimensions by the original estimate. This can result in the view never
getting properly enlarged.
Bug 7240251
Change-Id: I44fc017f8b661121f0042fcd59a4efde70be6bbe
2012-09-26 15:21:39 -07:00
Dianne Hackborn
4d5c2b0317
Fix issue #7238170 : Edit picture option is not available for the secondary user.
...
Change-Id: Icb3229f543f286afb4a31e267099eceaa0cca11d
2012-09-26 15:10:30 -07:00
Amith Yamasani
d648a605e8
Fix sync problems when setting up a new user and account
...
Bug: 7197445
The listener on AccountManager is not sufficient since it only triggers when
primary user's accounts change.
Switch to watching for LOGIN_ACCOUNTS_CHANGED_ACTION for all users.
Change-Id: I63f526aebd70f0ad777490f3e0b6e6894220d26c
2012-09-26 15:06:10 -07:00
Dianne Hackborn
c14a9113c5
am e440f47d: am e5215730: Merge "Maybe fix issue #7211766 : bindService() to User u0 While u10 is..." into jb-mr1-dev
...
* commit 'e440f47d95cefe02bc76d6b57d6e2b248b052f93':
Maybe fix issue #7211766 : bindService() to User u0 While u10 is...
2012-09-26 15:00:23 -07:00
Dianne Hackborn
7a0437b89a
am e5215730: Merge "Maybe fix issue #7211766 : bindService() to User u0 While u10 is..." into jb-mr1-dev
...
* commit 'e521573097390ce5465fc9b88dee2ae62f2317c6':
Maybe fix issue #7211766 : bindService() to User u0 While u10 is...
2012-09-26 14:57:38 -07:00
Dianne Hackborn
e521573097
Merge "Maybe fix issue #7211766 : bindService() to User u0 While u10 is..." into jb-mr1-dev
2012-09-26 14:55:19 -07:00
Dianne Hackborn
b12e1354f2
Maybe fix issue #7211766 : bindService() to User u0 While u10 is...
...
...Forground Sometimes Doesn't Take
The main change here is a one-liner in ActiveServices to check the
uid when deciding whether to remove an item from mPendingServices.
This could cause the problem being seen -- if the same service for
two users is starting at the same time, the second one would blow
away the pending start of the first one. Unfortunately I have had
trouble reproducing the bug, so I don't know if this is actually
fixing it. It's a bug, anyway.
The reason so much has changed here is because I spread around
logging and printing of the user ID associated with operations and
objects to make it easier to debug these kind of multi-user things.
Also includes some tweaks to the oom manager to allow more background
processes (I have seen many times in logs where we thrash through
processes because the LRU list is too short), plus to compensate an
additional time-based metric for when to get rid of background processes,
plus some new logic to try to help things like Chrome keep around
their service processes.
Change-Id: Icda77fb2a1dd349969e3ff2c8fff0f19b40b31d3
2012-09-26 14:50:12 -07:00
Jesse Hall
5d7b4368d9
am bbe1860a: am 62fbb831: Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev
...
* commit 'bbe1860ae38b96d4d347990d1fb857e978828224':
Document interaction of SurfaceView and post-layout transforms
2012-09-26 14:39:45 -07:00
Jesse Hall
0e3fdd17a7
am 62fbb831: Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev
...
* commit '62fbb8311a1fe84fd1b09e27169757c85d7933cb':
Document interaction of SurfaceView and post-layout transforms
2012-09-26 14:37:21 -07:00
Jesse Hall
62fbb8311a
Merge "Document interaction of SurfaceView and post-layout transforms" into jb-mr1-dev
2012-09-26 14:34:44 -07:00
Fabrice Di Meglio
d28c3643a6
am 21289957: am fea9df63: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit '21289957a91213c922236deb6010dbde1d652c5e':
Fix bug #6427629 Clean up layout direction APIs
2012-09-26 13:58:11 -07:00
Fabrice Di Meglio
93ba6c22fb
am fea9df63: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
...
* commit 'fea9df6386d66089b004719f194625e159bb344a':
Fix bug #6427629 Clean up layout direction APIs
2012-09-26 13:56:45 -07:00
Fabrice Di Meglio
fea9df6386
Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev
2012-09-26 13:54:16 -07:00
Romain Guy
1c8cd46a09
am 83b6c24e: am 54ea6bf2: Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173 " into jb-mr1-dev
...
* commit '83b6c24e612a0bf625c24502a3c0b7617a85af50':
Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173
2012-09-26 13:47:48 -07:00
Romain Guy
39bd0ce63a
am 54ea6bf2: Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173 " into jb-mr1-dev
...
* commit '54ea6bf2aa5e8d72c96f410d87ec96431abe641c':
Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173
2012-09-26 13:46:17 -07:00
Romain Guy
54ea6bf2aa
Merge "Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR Bug #7221173 " into jb-mr1-dev
2012-09-26 13:44:03 -07:00
Jeff Sharkey
2ecc9592e5
am a98137c1: am 1951db86: Merge "Multi-user ringtone playback." into jb-mr1-dev
...
* commit 'a98137c16d433ebc14e64c363e8c2fe86c74c2a7':
Multi-user ringtone playback.
2012-09-26 13:42:39 -07:00
Jeff Sharkey
c41a803b47
am 1951db86: Merge "Multi-user ringtone playback." into jb-mr1-dev
...
* commit '1951db86f527ff4e8c2ddf4306779ce956cd372d':
Multi-user ringtone playback.
2012-09-26 13:41:11 -07:00