Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,065 Commits 3 Branches 0 Tags
ec0e97fe7aed7db0ad4600ddf1bbbd817c2cbb1c
Commit Graph

8596 Commits

Author SHA1 Message Date
Amith Yamasani
dc5b1dd508 am 728f3193: am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev 
* commit '728f3193efbdacc81442f7cdcfc49d3c8804e5ee':
  DevicePolicyManager per user
 2012-09-19 15:18:46 -07:00
Dianne Hackborn
1cf4289349 am 8f2ec436: am 1e5aeecb: Merge "Don\'t allow more than 3 actively running users at a time." into jb-mr1-dev 
* commit '8f2ec4365f518a9752e379ca87e3fcdcd2c4c55f':
  Don't allow more than 3 actively running users at a time.
 2012-09-19 05:50:39 -07:00
Amith Yamasani
4adb9d3416 Merge "DevicePolicyManager per user" into jb-mr1-dev 2012-09-18 20:00:44 -07:00
Dianne Hackborn
1e5aeecb64 Merge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev 2012-09-18 18:22:15 -07:00
Dianne Hackborn
bb1aeff320 Don't allow more than 3 actively running users at a time. 
Change-Id: Ic047c62b518a0faaa7b507343909330044ec290b
 2012-09-18 18:20:43 -07:00
Jeff Sharkey
3611eacaaa am e339f025: am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev 
* commit 'e339f025e44558e251ac67fc3f3d5c909264adfc':
  Multi-user MTP.
 2012-09-18 15:33:23 -07:00
Andy Stadler
224ed25f2c am 37c6ec36: am ab3d0fd6: Merge "Move files to make eclipse-java happy" into jb-mr1-dev 
* commit '37c6ec36b8dc81781b737793e14d080d93ca5017':
  Move files to make eclipse-java happy
 2012-09-18 14:55:49 -07:00
Jeff Sharkey
6281d7cf32 Merge "Multi-user MTP." into jb-mr1-dev 2012-09-18 14:52:46 -07:00
Amith Yamasani
599dd7ce9a DevicePolicyManager per user 
Bug: 7136483

Store device policy information for each user and apply them when user switches.

Global proxy can only be controlled by owner.
Camera restriction applies to all users, if any one has an admin that disables it.
Storage encryption can only be controlled by owner, although other users can query the state.
Wipe data will only remove the user if non-zero, wipe the device, if zero.

Change-Id: I359be46c1bc3828fd13d4be3228f11495081c8f2
 2012-09-18 14:28:33 -07:00
Andy Stadler
ab3d0fd684 Merge "Move files to make eclipse-java happy" into jb-mr1-dev 2012-09-18 14:20:30 -07:00
Andy Stadler
d44daaba44 Move files to make eclipse-java happy 
No changes to text at all, just moving the java files to match their
declared packages.

There was no original bug# but this cleans up the code submitted in
the original Change-Id: I42307f58074157b33b6e01216aab10022340d449

Change-Id: I233fa7f21167a42565aadb7ad109600b1a1a5721
 2012-09-18 14:08:30 -07:00
Jeff Sharkey
27bd34d9d9 Multi-user MTP. 
The current MTP kernel driver at /dev/mtp_usb is exclusive, meaning
only one process can have it open. In addition, each MTP session
with a desktop requires unique object IDs, which doesn't hold true
across users on the device.

To solve these two issues, when switching users we cycle the USB host
stack to disconnect both local and remote MTP connections, giving the
new user's media process a chance to claim /dev/mtp_usb, and causing
the desktop to initiate a new MTP session.

This change also allows BroadcastReceivers to registerReceiver()
allow retrieval of a current sticky broadcast. Adds a system property
to override maximum users. Removes MOUNTED broadcasts for secondary
users. Allows INTERACT_ACROSS_USERS to getCurrentUser().

Bug: 6925114
Change-Id: I02b4a1b535af95fb2142655887b6d15a8068d18a
 2012-09-18 13:26:26 -07:00
Irfan Sheriff
bb326e1445 am bebf9f7b: am 24ed2769: Merge "WFD fixes" into jb-mr1-dev 
* commit 'bebf9f7b7d7498bca9fe4b7e3ddd473dafb69c5d':
  WFD fixes
 2012-09-18 12:31:37 -07:00
Irfan Sheriff
24ed276913 Merge "WFD fixes" into jb-mr1-dev 2012-09-18 12:22:06 -07:00
Irfan Sheriff
e0c28d5f13 WFD fixes 
- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast

Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
 2012-09-18 12:20:37 -07:00
Amith Yamasani
5d6d74202f am a6760474: am f7a6dfca: Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 
* commit 'a6760474f751a1b9659f7a932a8debb09068fbe9':
  Pass Bitmap instead of ParcelFileDescriptor in UserManager
 2012-09-18 00:10:31 -07:00
Dave Burke
054e3a1aa6 am 08980a1f: am 049dd8e6: Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev 
* commit '08980a1f902a4ac8d485df91f8186598fc49043a':
  Revert "Specify max go intent for wifi display"
 2012-09-18 00:10:16 -07:00
Dianne Hackborn
03f2abecae am 596115b1: am c535d2f3: Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev 
* commit '596115b132c9c84f45088cc3cbd5aba9abe3c678':
  Fix dumb bug merging receivers for multiple users.
 2012-09-18 00:10:12 -07:00
Dianne Hackborn
fb67743848 am 20f8c730: am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev 
* commit '20f8c730a4d83a01ac92fc3f82129d523b4bc3ef':
  Fix API review bugs.
 2012-09-18 00:10:04 -07:00
Irfan Sheriff
e1d624017c am e8d79c87: am 218e2f19: Merge "Specify max go intent for wifi display" into jb-mr1-dev 
* commit 'e8d79c87c23845ad0a13dff999a9429e4197544b':
  Specify max go intent for wifi display
 2012-09-18 00:09:54 -07:00
Dianne Hackborn
560f555c43 am c0b59093: am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 
* commit 'c0b590932d611e842836d1662a4baa4812d07b21':
  Try again to fix issue #6912004:tap on gmail notification sends me to home screen
 2012-09-18 00:09:31 -07:00
Amith Yamasani
f7a6dfcafc Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 2012-09-17 22:53:21 -07:00
Amith Yamasani
e928d7d95d Pass Bitmap instead of ParcelFileDescriptor in UserManager 
Add a USER_INFO_CHANGED intent for lockscreen and quicksettings to use
to monitor changes to the user name or icon.

Bug: 7164040
Change-Id: Id6fb8b6d38ce04ccd02bbadcf0c10699783d6c03
 2012-09-17 21:46:51 -07:00
Dave Burke
049dd8e6a3 Merge "Revert "Specify max go intent for wifi display"" into jb-mr1-dev 2012-09-17 18:58:11 -07:00
Dave Burke
ee261a5a6c Revert "Specify max go intent for wifi display" 
This reverts commit 7ab7260697

Change-Id: I5b322f41729695465b164e1dfe6d4b1902cd8117
 2012-09-17 18:56:19 -07:00
Dianne Hackborn
c535d2f30e Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev 2012-09-17 18:52:30 -07:00
Dianne Hackborn
6cbd33fc25 Fix dumb bug merging receivers for multiple users. 
Also clean up some debug output.

Change-Id: Ib19e47682e9ddfc6a234bd61d054275a362d28cc
 2012-09-17 18:43:00 -07:00
Dianne Hackborn
c33f94e2a5 Merge "Fix API review bugs." into jb-mr1-dev 2012-09-17 18:22:38 -07:00
Irfan Sheriff
218e2f199b Merge "Specify max go intent for wifi display" into jb-mr1-dev 2012-09-17 17:37:48 -07:00
Irfan Sheriff
7ab7260697 Specify max go intent for wifi display 
For p2p and sta single channel concurrency, we need the device
to be a GO

Change-Id: I8c3f180b8fc450238e24dace478f03cdf4e370a7
 2012-09-17 17:34:03 -07:00
Dianne Hackborn
8832c18d8b Fix API review bugs. 
7173152 API REVIEW: android.content.pm.PackageUserState
7172969 API REVIEW: android.app.PendingIntent
7172730 API REVIEW: android.content.Context
7172726 API REVIEW: android.manifest.permission

Change-Id: Iad470256d3b5ca5596487f6a699ec1871457c3b5
 2012-09-17 17:27:15 -07:00
Dianne Hackborn
4246f695f4 Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 2012-09-17 16:19:14 -07:00
Geremy Condra
83f734080b am 337e4026: am c31f5a7e: Merge "Add error information to event logs." into jb-mr1-dev 
* commit '337e4026576d4b3895521e472db12d7322d2c37a':
  Add error information to event logs.
 2012-09-17 16:12:30 -07:00
Geremy Condra
c31f5a7efe Merge "Add error information to event logs." into jb-mr1-dev 2012-09-17 16:07:46 -07:00
Geremy Condra
beb9d53971 Add error information to event logs. 
Change-Id: Ie4bbb888f4fac4db42a60b9fdd6818af24b834bd
 2012-09-17 16:06:17 -07:00
Dianne Hackborn
ad9b32115b Try again to fix issue #6912004:tap on gmail notification sends me to home screen 
Add a new call to the activity manager to tell it when the activity
is resumed, so it can mark its state as dirty then instead of when
it first tries to create it.

Also tweak things to update the LRU list for the upcoming activity
at the point we start pausing the current activity, to avoid an
inefficiency where we may decide to kill the process of the upcoming
activity if it is at the end of the LRU list.

Change-Id: Ia6dc8c34dc6d4b085a1efbe3a5d5f47721d55078
 2012-09-17 16:03:22 -07:00
Kenny Root
53122a32e6 am 9c7ec4af: am 4215017c: Merge "Use shared app gid for dalvik cache" into jb-mr1-dev 
* commit '9c7ec4af3b90007e64ea2e2c62a4ef85d60596c9':
  Use shared app gid for dalvik cache
 2012-09-17 15:34:45 -07:00
Kenny Root
4215017c12 Merge "Use shared app gid for dalvik cache" into jb-mr1-dev 2012-09-17 15:29:38 -07:00
Amith Yamasani
9d37dfd4cc am 58cb80f6: am 1d31d5ba: Merge "Start userId from 10, reserving 1-9 for special use in the future." into jb-mr1-dev 
* commit '58cb80f6ce61156953b52e3f48409475077a726f':
  Start userId from 10, reserving 1-9 for special use in the future.
 2012-09-17 15:01:28 -07:00
Amith Yamasani
1d31d5ba12 Merge "Start userId from 10, reserving 1-9 for special use in the future." into jb-mr1-dev 2012-09-17 14:56:03 -07:00
Amith Yamasani
07a0ede729 Start userId from 10, reserving 1-9 for special use in the future. 
Change-Id: I3d0c1717d8b3add75ba43ed98e53ba02e6682c34
 2012-09-17 14:54:26 -07:00
Jeff Brown
1a66bd5150 am 39b9c91e: am e2fb5190: Merge "Swap remote submix initialization order." into jb-mr1-dev 
* commit '39b9c91ebf8ad937cb80c521e923e1bf713a6716':
  Swap remote submix initialization order.
 2012-09-17 14:54:23 -07:00
Amith Yamasani
4a1e7e3c59 am 83385ecc: am e645324e: Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 
* commit '83385eccc5274443d90d4c4dc821e6281fee4af6':
  Add UserManager.getUserIcon()
 2012-09-17 14:54:05 -07:00
Craig Mautner
45bb2d4f2c am d8132081: am 178af594: Add debug to help with b/7135184. 
* commit 'd8132081b57233b7dda9863a6c51693d5971cd30':
  Add debug to help with b/7135184.
 2012-09-17 14:53:36 -07:00
Irfan Sheriff
0f0e58ccf2 am 1fa0aa29: am 89c82814: Merge "Add restoreCallingIdentity under finally" into jb-mr1-dev 
* commit '1fa0aa291ba1fd499b312fb2c8a5dcf288751606':
  Add restoreCallingIdentity under finally
 2012-09-17 14:46:03 -07:00
Dianne Hackborn
9905a8d4bb am 68128325: am 443e4748: Merge "Fix issue #7175553: GRANT_URI_PERMISSION doesn\'t apper to work on secondary user" into jb-mr1-dev 
* commit '681283257d6ff4f77a5ca66a0e7ad51c90320db6':
  Fix issue #7175553: GRANT_URI_PERMISSION doesn't apper to work on secondary user
 2012-09-17 14:45:54 -07:00
Irfan Sheriff
9fe955c4fc am e3141345: am db831da4: Fix permission accessing getCurrentUser 
* commit 'e3141345d81a0f667bb3980e28183bb95a281215':
  Fix permission accessing getCurrentUser
 2012-09-17 14:45:51 -07:00
rich cannings
088967f9bb am 35fc1145: am 97e7c59c: Merge "Enable package verification" into jb-mr1-dev 
* commit '35fc1145a56f0a739c3ba065499174f49d98a137':
  Enable package verification
 2012-09-17 14:45:32 -07:00
Iliyan Malchev
97fe30d658 am 793126fe: am 86e85efe: Merge "Set backlight brightness in correct order." into jb-mr1-dev 
* commit '793126fe63043d5f07d260ffed7ac938cd1f1a22':
  Set backlight brightness in correct order.
 2012-09-17 14:45:28 -07:00
Irfan Sheriff
a8aead0a48 am e3dc7055: am 3849490c: Merge "Return empty scan results for background user" into jb-mr1-dev 
* commit 'e3dc7055cddbadc04e51003f17ab4dbdbb6f58df':
  Return empty scan results for background user
 2012-09-17 14:45:07 -07:00