34612 Commits

Author SHA1 Message Date
Romain Guy
97723b2eb4 Fix HierarchyViewer so it can load Contacts
Change-Id: I5d5f400a9283f9c2431d91a10f85be42b02fe6a0
2012-09-27 23:36:34 -07:00
Baligh Uddin
d9730390c6 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-27 08:36:33 -07:00
Satoshi Kataoka
2da2ec19e0 Merge "Fix imf flag" into jb-mr1-dev 2012-09-27 04:06:14 -07:00
Satoshi Kataoka
accd22aa63 Fix imf flag
Change-Id: I28a3155f329a3bd8b8a8f5d06b5ab21eba7d4558
2012-09-27 20:04:38 +09:00
Dianne Hackborn
66442c7e7b Merge "Work on issue #7232641: ISE crash when rotating phone in label list mode" into jb-mr1-dev 2012-09-27 00:54:55 -07:00
Dianne Hackborn
f43a33c5ea Work on issue #7232641: ISE crash when rotating phone in label list mode
This doesn't fix the problem; I think it is an app problem.  It does
improve a bunch of the debugging to help better identify what is going
on, and introduces some checks when adding a fragment to fail
immediately if we are getting into a state when a fragment is going to
be in the added list multiple times (which is pretty much guaranteed
to lead to a failure at some point in the future).

Change-Id: If3a8700763facd61c4505c6ff872ae66875afc8d
2012-09-27 00:51:56 -07:00
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 Sharkey
dd78d462f6 Fix JNI method signature.
Change-Id: I156624e0ac55330f43d9c4d7f15d59f6c529aa0a
2012-09-26 18:46:08 -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
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
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
Philip Milne
eed8f06f7f Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 2012-09-26 17:30:20 -07:00
Jeff Brown
0c9bbf4e13 Merge "Make DreamManagerService more robust." into jb-mr1-dev 2012-09-26 17:25: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
Baligh Uddin
3a584a04dc Import translations. DO NOT MERGE
Change-Id: Ie6eb08259dca43c4935c085f0fd7659950f591be
Auto-generated-cl: translation import
2012-09-26 16:43:37 -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 fd901f735c858af8ec8884b2e7ab71a46a9639e6 and 5e21bf934b2a71b595deb9856a2044eea4dbce86

Bug: 7237764
Bug: 6693087
Change-Id: I7cc9657e4df219481eb33de803081a01b13ee0f2
2012-09-26 15:48:21 -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
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
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
fea9df6386 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-26 13:54:16 -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
1951db86f5 Merge "Multi-user ringtone playback." into jb-mr1-dev 2012-09-26 13:38:22 -07:00
Romain Guy
bd43152bda Always set the EGL_BUFFER_PRESERVED EGL_SWAP_BEHAVIOR
Bug #7221173

Change-Id: I231a47187792c93af9e3b9321fd1e25bc2f20117
2012-09-26 13:36:47 -07:00
Jesse Hall
c9f345ff7b Document interaction of SurfaceView and post-layout transforms
Bug: 7179570
Change-Id: I9c4d71242bcb832c0cb3b62ec26aba54f146d70a
2012-09-26 12:07:12 -07:00
Xia Wang
b4510e3c6d Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev 2012-09-26 11:58:59 -07:00
Scott Main
4368ba45ad am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '3cda846725c31b49f6c60ba986ccc7b2eb1adab3':
  add analog clock attributes to docs
2012-09-26 11:49:48 -07:00
Scott Main
3cda846725 am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '8bf95ee635b0cada3c6c2d21801bbd1e871b9fcc':
  add analog clock attributes to docs
2012-09-26 11:47:38 -07:00
Scott Main
8bf95ee635 am ed5ff3bd: add analog clock attributes to docs
* commit 'ed5ff3bdb015b0dc391a566d6f61ba7a533b3843':
  add analog clock attributes to docs
2012-09-26 11:45:21 -07:00
Scott Main
ed5ff3bdb0 add analog clock attributes to docs
Change-Id: I70e8a7897f9e076664ea5069ee9e19e458e8b36b
2012-09-26 11:42:09 -07:00
Philip Milne
4118012da9 Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
Change-Id: Ie38952bbaace080e81e41e61350cda172951d548
2012-09-26 11:29:25 -07:00
John Spurlock
fddedc94b7 Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev 2012-09-26 11:16:00 -07:00
Jeff Sharkey
65c4a2b26c Multi-user ringtone playback.
Change RingtonePlayer to open content:// Uris based on requesting
UserHandle.  Grant SystemUI visibility to all emulated storage so
it can play ringtones for apps without READ_EXTERNAL_STORAGE.

Resolve canonical file:// Uris before passing out of source app,
replacing any /emulated_legacy/-style paths with user-specific
variant so they can be opened by SystemUI.  Calling for RemoteViews,
Ringtones, and Notifications.

Bug: 7202982
Change-Id: Ibf0eca8df80c1486711144a7b648f464aadfe099
2012-09-26 10:49:35 -07:00
John Spurlock
f41f505fac Dream metadata now specified using an xml-resource.
Removed old metadata key for dream settings activity, now defined in attrs.xml.

Also took this opportunity to remove Dream#lightsOut.

Bug:7172816
Bug:7211867
Change-Id: Ied18a527d2dc2aacc19d7a9543f090653232f0ed
2012-09-26 12:44:39 -04:00
Xia Wang
3272a38dbc Fix Wifi Stress test after wifi settings are moved to Settings.global
Change-Id: I823e99b39bc340683b686bb0dd43a473865656f0
2012-09-26 09:23:59 -07:00
Glenn Kasten
2832136bb6 Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev 2012-09-26 08:51:33 -07:00
Kenny Root
f05d511bc9 Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev 2012-09-25 23:35:56 -07:00
Kenny Root
df8bfe0cf6 LockScreen: only set keystore password for owner
Since KeyStore doesn't support multi-user, only unlock or set the
password on the keystore when the "owner" enters a password.

Bug: 7169463
Change-Id: I97b4ba714dc6e400a6e45825c71f81c4629392d8
2012-09-25 22:57:41 -07:00
Adam Powell
e8e2b67256 Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev 2012-09-25 19:35:54 -07:00
Adam Powell
d736d2069b Further tweak touchMajor/Minor stabilization in ScaleGestureDetector
Change-Id: Ifa717c7dee96c5a2eb18a414a257f01762365b00
2012-09-25 19:30:44 -07:00