Commit Graph

8790 Commits

Author SHA1 Message Date
Christopher Tate
fc3cacdb0e am b990c001: am 3f91e43e: Merge "Full (local) restore security changes" into jb-mr1-dev
* commit 'b990c001e19cca13a139c1979a8a5e431d85a855':
  Full (local) restore security changes
2012-09-28 00:34:22 -07:00
Adam Cohen
a2ba6f9202 am 080ee3ef: am 580ee8b0: Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev
* commit '080ee3ef55ec32bc6a3254814f9fd717767dfa7e':
  Fixing AppWidgetService / AppWidgetHost to work in system process
2012-09-28 00:33:42 -07:00
Christopher Tate
3f91e43eb0 Merge "Full (local) restore security changes" into jb-mr1-dev 2012-09-27 14:58:47 -07:00
Christopher Tate
f6d6fa8cbc Full (local) restore security changes
(1) Prevent full restore from creating files/directories that are
    accessible by other applications

(2) Don't restore filesets from "system" packages; i.e. any that runs
    as a special uid, unless they define their own agent for handling
    the restore process.

Bug 7168284

Change-Id: Id6a0cb4c113c2e4a8c4605252cffa41bea22d8a3
2012-09-27 12:54:37 -07:00
Adam Cohen
580ee8b0c6 Merge "Fixing AppWidgetService / AppWidgetHost to work in system process" into jb-mr1-dev 2012-09-27 11:17:20 -07:00
Dianne Hackborn
7e31a58e55 am ce56b399: am 2480bc12: Merge "Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev
* commit 'ce56b399e1e71f97ec9830ad0973f44555c0fd4f':
  Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user
2012-09-27 00:57:09 -07:00
Dianne Hackborn
2480bc12a5 Merge "Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user" into jb-mr1-dev 2012-09-27 00:53:08 -07:00
Dianne Hackborn
c7ba771a45 Fix issue #7232952: Settings crash on tapping on Downloaded apps on a secondary user
Also tweak bind flags for new location services so they
aren't put so aggressively up in the oom adj list.

Change-Id: I9da25a3fea7681013b4d95b7db7e9a808f2d733b
2012-09-26 23:22:59 -07:00
Jeff Brown
75d4ab1c88 am c8ce6750: am 7bb89cf1: Merge changes I2c09abaa,I9d8406e1 into jb-mr1-dev
* commit 'c8ce675003aa2326965fee1eb3b33ea7dec79a8e':
  Cure narcolepsy.
  Allow applications to connect to known wifi displays.
2012-09-26 20:25:33 -07:00
Jeff Sharkey
1028bcdfa2 am 73f7617a: am f21b94a8: Merge "Remove unused Secure settings." into jb-mr1-dev
* commit '73f7617ac68042af0203dfb0aa070be62dca2c97':
  Remove unused Secure settings.
2012-09-26 20:23:13 -07:00
Jeff Sharkey
4cabbc5be7 am f57fcddb: am 68b7a6d1: Merge "First step towards cleaning up Global settings." into jb-mr1-dev
* commit 'f57fcddb61236c6e9c145d8f310bf1f4b1daafbb':
  First step towards cleaning up Global settings.
2012-09-26 20:23:07 -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 Brown
f9d40f4236 Cure narcolepsy.
Bug: 7204211
Change-Id: I2c09abaad5d321cec6f62f7ca0ce00c3b61ee211
2012-09-26 18:57:48 -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
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
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
95ece7b125 am 763ae223: am ead9054f: Merge "Move DreamManagerService to its own package." into jb-mr1-dev
* commit '763ae223db9e79f87d9a99ca9d126657a236601e':
  Move DreamManagerService to its own package.
2012-09-26 17:20:50 -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
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
Jeff Brown
cef440f2a2 Move DreamManagerService to its own package.
Bug: 7204211
Change-Id: Ia6cfe252647161df357a4de149a06fa1e3fd63fa
2012-09-26 15:24:27 -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
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
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
1951db86f5 Merge "Multi-user ringtone playback." into jb-mr1-dev 2012-09-26 13:38:22 -07:00
Philip Milne
4118012da9 Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
Change-Id: Ie38952bbaace080e81e41e61350cda172951d548
2012-09-26 11:29:25 -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
Victoria Lease
ba82661e5a am 3421fea5: am 72a37470: Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev
* commit '3421fea5046f9371f8b42eb66da33a611b685fba':
  getBestProvider() prefers GPS over NLP
2012-09-26 10:07:23 -07:00
Satoshi Kataoka
ae4b3ef35d am 05ff6145: am 4e1ab15b: Enable multi-user function for IMF
* commit '05ff6145897391546a8b07d1593e17e34286228a':
  Enable multi-user function for IMF
2012-09-26 08:27:06 -07:00
Victoria Lease
72a374705d Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev 2012-09-26 07:59:13 -07:00
Satoshi Kataoka
4e1ab15b30 Enable multi-user function for IMF
Bug: 6931482

Change-Id: Ib23849d352db33f0747aa9d5a178f00ac726c13b
2012-09-26 19:22:04 +09:00
Matthew Xie
56ead42691 am 8568915d: am 5e1c74db: Merge "Remove permission check in registerAdapter" into jb-mr1-dev
* commit '8568915d21af522a55c471c9bec72f07cdee1811':
  Remove permission check in registerAdapter
2012-09-25 21:08:57 -07:00
Matthew Xie
5e1c74dbbe Merge "Remove permission check in registerAdapter" into jb-mr1-dev 2012-09-25 21:04:15 -07:00
Matthew Xie
670ef53353 Remove permission check in registerAdapter
This matches the JB behavior of getDefaultAdapter public api
bug 6948829

Change-Id: I86135bf45fddbb2d078f855f91a34d6fcce237a2
2012-09-25 18:25:54 -07:00
Jeff Sharkey
7339e3b567 am 0b0a8c93: am 6e065a72: Merge "Handle multi-user mountObb() requests." into jb-mr1-dev
* commit '0b0a8c933cb5280b4200d92964d4b68c91362cf9':
  Handle multi-user mountObb() requests.
2012-09-25 17:56:00 -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
Jeff Brown
9da4d74477 am 876f95ed: am b32e2216: Merge changes I332f020f,I632648ac into jb-mr1-dev
* commit '876f95ed7f914b4d86634db552277f835d288805':
  Update references to migrated global settings.
  Handle user switched for settings changes.
2012-09-25 17:11:25 -07:00
Jeff Brown
9cfc4dbf40 am 7a0184b7: am 0a52088e: Merge "Fix typo." into jb-mr1-dev
* commit '7a0184b70c6f648bf50acf52a3cc10de068d53e0':
  Fix typo.
2012-09-25 17:07:38 -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
Jeff Brown
0a52088e58 Merge "Fix typo." into jb-mr1-dev 2012-09-25 17:02:06 -07:00
Svetoslav Ganov
2a0168615b am dfd00788: am c91fb587: Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev
* commit 'dfd007884d104417b8d39fd2002f09b11ac875f8':
  Adding a global accessibility action to open quick settings.
2012-09-25 16:52:34 -07:00
Svetoslav Ganov
c91fb5875b Merge "Adding a global accessibility action to open quick settings." into jb-mr1-dev 2012-09-25 16:47:06 -07:00
Svetoslav Ganov
e20a177d3f Adding a global accessibility action to open quick settings.
1. Added APIs for opening the quick settings to the StatusBarManagerService
   and the local StatausBarManager. The new APIs are protected by the old
   EXPAND_STATUS_BAR permission.
   Renamed the expand* and collapse* non-public APIs that are expanding
   the notifications to expandNotifications* collapseNotifications* to
   better convey what they do given that this change adds
   expandQuickSettings* and collapseQuickSettings*.
   Added a global action to the accessibility layer to expand the quick
   settings which is calling into the new status bar manager APIs.

bug:7030487

Change-Id: Ic7b46e1a132f1c0d71355f18e7c5a9a2424171c3
2012-09-25 16:07:59 -07:00
Amith Yamasani
7585c8f39d am c33ad3be: am be47828f: Merge "Load resources for the correct user" into jb-mr1-dev
* commit 'c33ad3bec8c9670a2671b6217bdfc2b7bbe6e437':
  Load resources for the correct user
2012-09-25 15:53:43 -07:00