Commit Graph

25558 Commits

Author SHA1 Message Date
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
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
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
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
cd4a962a84 am 13987fb4: Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev
* commit '13987fb43255ccb3802d415e32b1c5caf14291bb':
  Reverting public setSoWriteTimeout
2012-09-26 16:09:03 -07:00
Brian Carlstrom
13987fb432 Merge "Reverting public setSoWriteTimeout" into jb-mr1-dev 2012-09-26 16:05:00 -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
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
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
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
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
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
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
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
Scott Main
69b05e74a4 am 4368ba45: am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs
* commit '4368ba45adebf17d7962ad551363ac302cb2b1c7':
  add analog clock attributes to docs
2012-09-26 11:51:56 -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
5d15dd08bf am fddedc94: Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev
* commit 'fddedc94b77812ea13afe8cae32ad27d7266f787':
  Dream metadata now specified using an xml-resource.
2012-09-26 11:17:55 -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
Adam Powell
3caf305efd am e8e2b672: Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" into jb-mr1-dev
* commit 'e8e2b672563fed2820e392de48226acf894cf06b':
  Further tweak touchMajor/Minor stabilization in ScaleGestureDetector
2012-09-25 19:38:29 -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
Jeff Sharkey
558f6d654f am 6e065a72: Merge "Handle multi-user mountObb() requests." into jb-mr1-dev
* commit '6e065a729dbf08f99209a7710da80442a394ec0d':
  Handle multi-user mountObb() requests.
2012-09-25 17:53:35 -07:00
Jeff Sharkey
6e065a729d Merge "Handle multi-user mountObb() requests." into jb-mr1-dev 2012-09-25 17:52:14 -07:00
Jeff Sharkey
4fbbda4cec Handle multi-user mountObb() requests.
Since emulated external storage paths differ based on execution
context, carefully fix up paths for various use-cases:

1. When sending paths to DefaultContainerService, always scope
   OBB paths as belonging to USER_OWNER.
2. When sending paths to vold, always build emulated storage paths
   visible to root.
3. Always use the original untouched path when talking with apps.

Mount OBB containers using shared app GID, so that an app can read
the mount point across users.

Handle legacy paths like "/sdcard" by resolving the canonical path
before sending to MountService.  Move tests to servicestests, and
add tests for new path generation logic.

Bug: 7212801
Change-Id: I078c52879cd08d9c8a52cc8c83ac7ced1e8035e7
2012-09-25 17:34:48 -07:00
Adam Powell
1f16daf7e2 am b4693e25: Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev
* commit 'b4693e25b1a576718eb669a74a056b3f1e451117':
  Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector.
2012-09-25 17:19:30 -07:00
Adam Powell
b4693e25b1 Merge "Smooth out handling of touchMajor/touchMinor in ScaleGestureDetector." into jb-mr1-dev 2012-09-25 17:17:22 -07:00
Jeff Brown
3476cb8ec2 am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev
* commit 'b32e221699201cb647beae3fe0a1771fd5a41cf4':
  Update references to migrated global settings.
  Handle user switched for settings changes.
2012-09-25 17:05:56 -07:00
Jeff Brown
b32e221699 Merge changes I332f020f,I632648ac into jb-mr1-dev
* changes:
  Update references to migrated global settings.
  Handle user switched for settings changes.
2012-09-25 17:03:11 -07:00
Dianne Hackborn
894aedafea am 61ad1bac: Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev
* commit '61ad1bacf8985e088c039d90123bf0d2a5de94fe':
  Fix AbsListView to correctly retain its state if not layed out.
2012-09-25 16:52:02 -07:00
Svetoslav Ganov
53da9d3490 am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
* commit 'c91fb5875bfd7f91d50d6fe939873872b53c8b2f':
  Adding a global accessibility action to open quick settings.
2012-09-25 16:49:56 -07:00
Dianne Hackborn
61ad1bacf8 Merge "Fix AbsListView to correctly retain its state if not layed out." into jb-mr1-dev 2012-09-25 16:49:05 -07:00
Brian Carlstrom
71d2b48fb7 am fe54290d: Merge "Add a static generator that takes a Socket Write Timeout Argumanet" into jb-mr1-dev
* commit 'fe54290df0c5d495b7f388035a4ae3a20821a183':
  Add a static generator that takes a Socket Write Timeout Argumanet
2012-09-25 16:48:02 -07:00