158 Commits

Author SHA1 Message Date
Robin Lee
6902e8eb7b Revert DevicePolicyManager PrivateKey APIs
These were committed to the wrong branch and left some debug
statements in.

Bug: 15065444
Change-Id: Idc25774c9ab1a61080290bebd6f5c4f24e6ee2e0
2014-09-06 21:07:14 +01:00
Amith Yamasani
7fd339a2be am 86acf269: am 90f3b5ad: am 0c3b7b15: Merge "Don\'t allow guests to install from unknown sources" into lmp-dev
* commit '86acf269215992eb4d79eef9cad58986fd42dac4':
  Don't allow guests to install from unknown sources
2014-09-05 17:19:30 +00:00
Amith Yamasani
a240d8377a Merge "Don't allow guests to install from unknown sources" into lmp-dev 2014-09-05 16:32:30 +00:00
Craig Mautner
b5f552b5eb am 7eb323c7: am ae433669: am ac8731f9: Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev
* commit '7eb323c78bb9c06ccf8b13b87b0a723254030387':
  Eliminate deadlock by deferring wipe data call
2014-09-04 21:28:33 +00:00
Craig Mautner
127343cb46 Merge "Eliminate deadlock by deferring wipe data call" into lmp-dev 2014-09-04 20:41:39 +00:00
Craig Mautner
66eb521833 Eliminate deadlock by deferring wipe data call
The call to RecoverySystem.rebootWipeUserData() was made while
holding the lock to DevicePolicyManagerService. But it blocks
waiting for system_process' main thread to receive the ordered
broadcast complete callback. It won't receive that callback
because Keyguard is running on the main thread and is concurrently
blocked on DevicePolicyManagerService.

By moving the call to rebootWipeUserData() out of the synchronized
block the deadlock is eliminated.

Fixes bug 16870054.

Change-Id: I3eb587211e5484859cc9dab7e80e5a1f6c85225d
2014-09-04 12:56:39 -07:00
Amith Yamasani
29ce85bab9 Don't allow guests to install from unknown sources
Added a user restriction when creating a guest.
Made sure that guests can't install profile owners that
could undo the restriction.

Bug: 17359648
Change-Id: Icdd919e8b1cbd79a69aacb76e573ec3449f18e4c
2014-09-03 17:30:43 -07:00
Esteban Talavera
5fcad0a6b0 resolved conflicts for merge of 82b53329 to master
Change-Id: Icfdf1a9b563560ca7998f9f9d403df33eff94a46
2014-09-03 19:57:35 +01:00
Esteban Talavera
808f6ef2ac Pass ComponentName to probing certificate methods
Pass ComponentName and check whether that admin is a profile owner on DPM
get/has certificate methods (requested on the API review).

As per Change I55eec17e01489ab323f8a0e68b11592605a7b740, not keeping track of
which admins installed which certificates for now:

"Having per-admin CA certificates would be a fair bit of work. The only MDMs
we're opening this up to for now are Device and Profile Owners which 100%
manage the profile so will be the only admin.
It seems like if we keep track of "who installed which certs" it'll be a little
pointless because the answer will always be "the ProfileOwner" for every single
one."

Bug: 17005622
Change-Id: I45e9dac5236ab4ed235a341c208ac3cb6aba17da
2014-09-03 11:50:55 +00:00
Julia Reynolds
5fd5d461d2 am e7472cec: am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev
* commit 'e7472cec1f01174c6dfdbbbd1287dcde56c1a21e':
  Audio/Micrphone user restriction/multiuser updates.
2014-08-28 20:10:38 +00:00
Julia Reynolds
a8528c6420 Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev 2014-08-28 19:41:42 +00:00
Robin Lee
de139a7953 am 427ff190: am 2509e94c: am 6c581286: Merge "Relocate broken getCallingUserId() calls" into lmp-dev
* commit '427ff1903e0e202ffece1b216206bd9fb4d9b425':
  Relocate broken getCallingUserId() calls
2014-08-28 16:47:50 +00:00
Robin Lee
65c2797082 Relocate broken getCallingUserId() calls
This should not be invoked while the calling identity is cleared
because it will return the current user rather than the calling user.

Bug: 17314802
Change-Id: I587daa420b0976d41928ab7c34eeda2329c1341e
2014-08-28 16:59:11 +01:00
Esteban Talavera
09f0e2c125 am c1be5a52: am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked
* commit 'c1be5a52df1c8b3888dd911a882ecbcb88aa5abe':
  Renamed getUninstallBlocked to isUninstallBlocked
2014-08-28 11:01:36 +00:00
Esteban Talavera
729b2a6c2f Renamed getUninstallBlocked to isUninstallBlocked
As per API review.

Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
2014-08-28 10:56:18 +01:00
Julia Reynolds
b53453fae0 Audio/Micrphone user restriction/multiuser updates.
1. Persist microphone mute state.
2. Set mute state for correct user.
3. Check for settings restrictions as the correct user.

Bug: 17177502
Bug: 16701642
Change-Id: Id8b6cd90c5caceb67fbec862f90aac7ec7a00b3c
2014-08-27 16:25:00 -04:00
Julia Reynolds
f1e13ba1a2 am f7f6b67d: am 68ddd6d9: am e21130fd: Merge "Limit the settings profile/device owners can update." into lmp-dev
* commit 'f7f6b67dfc68404e9b18e944ff0ef8ae2c0465b0':
  Limit the settings profile/device owners can update.
2014-08-27 17:28:28 +00:00
Sander Alewijnse
b6c0fc8625 am 12df8729: am 45fb047d: am eb3f4b1c: Merge "Provide lockdown of date/time device owners." into lmp-dev
* commit '12df87292e529a13ae033cda7197abacdd68b9ee':
  Provide lockdown of date/time device owners.
2014-08-27 17:05:48 +00:00
Julia Reynolds
19d431f330 Merge "Limit the settings profile/device owners can update." into lmp-dev 2014-08-27 16:49:46 +00:00
Julia Reynolds
9ed66da8df Limit the settings profile/device owners can update.
Bug: 16351901
Change-Id: Id33a57ad651b5b7b58de0549eb90d5a1fe5c19c5
2014-08-27 11:49:37 -04:00
Sander Alewijnse
0ced627291 Provide lockdown of date/time device owners.
Fixed two minor issues with the screencapture as well.
Updated documentation and added enforceCrossUserPermission.

Bug:16948504
Change-Id: I9a645dcf480a4a044879ba481bce964d06fe5153
2014-08-26 14:44:53 +01:00
Jason Monk
ce83d47be2 am f4ecc050: am eb41e467: am cc300347: Merge "Write device owner name to XML" into lmp-dev
* commit 'f4ecc050705edf6c85fd43b009532eb0fb9fb880':
  Write device owner name to XML
2014-08-21 21:01:52 +00:00
Jason Monk
de3af82ce0 Merge "Write device owner name to XML" into lmp-dev 2014-08-21 20:28:10 +00:00
Jason Monk
4e7a65f15c Write device owner name to XML
So that it can be remembered.

Bug: 17153003
Change-Id: I6fb96334f235348bc237cc52e09c2fe5ef1332b7
2014-08-21 15:50:48 -04:00
Esteban Talavera
4d3fc0b828 am 3c736f5a: am 87d536ab: am 5f9653ce: Merge "Rename get/setBlockUninstall() to get/setUninstallBlocked()" into lmp-dev
* commit '3c736f5a538c44e6a438157a18378abad036c75b':
  Rename get/setBlockUninstall() to get/setUninstallBlocked()
2014-08-21 15:21:58 +00:00
Esteban Talavera
6f52c702fb am fd496a2c: am 50a84946: am 58dada0d: Merge "Remove setApplicationsHidden" into lmp-dev
* commit 'fd496a2c66d6f45e0cb009e8a52360b3560cdcc4':
  Remove setApplicationsHidden
2014-08-21 14:43:53 +00:00
Esteban Talavera
d5c5c13c85 Rename get/setBlockUninstall() to get/setUninstallBlocked()
As requested in the API review

Bug: 17005622
Change-Id: I1332ad11e588ab3fa409f2a28222608936cb383e
2014-08-21 15:30:13 +01:00
Esteban Talavera
8c5c373647 Merge "Remove setApplicationsHidden" into lmp-dev 2014-08-21 14:17:25 +00:00
Kenny Guy
6699748d68 resolved conflicts for merge of 06cc91a6 to master
Change-Id: I9e66cd0f41a5b26592a802c4cacbac772d663b73
2014-08-21 14:34:37 +01:00
Kenny Guy
b9e468cb9d Merge "Add apis for whitelisting IMEs and accessibility services." into lmp-dev 2014-08-21 10:54:26 +00:00
Esteban Talavera
115cd65d2a Remove setApplicationsHidden
As requested in the API review. This version (the one that takes an Intent) was used only in the DeviceAdminSample and some CTS tests.

Bug: 17005622
Change-Id: I9984b22836417ad4d025302f61bd91704e9345a4
2014-08-21 10:29:38 +01:00
Svet Ganov
99fb19fc49 am 413a6046: am 51cb9701: am 2b86b50b: Merge "Notify app widget hosts when cross-profile providers change." into lmp-dev
* commit '413a60460b9c1a8cb72a7362f96a882ed8f62e18':
  Notify app widget hosts when cross-profile providers change.
2014-08-21 04:10:26 +00:00
Julia Reynolds
b00889ddc2 resolved conflicts for merge of b259603d to master
Change-Id: Ia74bb64ce5946a86ecf05b8c4e258dd2ac68ba04
2014-08-20 22:42:08 -04:00
Kenny Guy
fa80a4faa3 Add apis for whitelisting IMEs and accessibility services.
Adds apis for device / profile owners to white list
the accessibility and input methods a user can enable.

Bug: 14469005
Change-Id: I921888660d29a5370395db87adf75d4d106660c9
2014-08-20 22:30:05 +01:00
Svet Ganov
6bd702538d Notify app widget hosts when cross-profile providers change.
1. Notify the hosts in the group if a package gets white-listed or
   un-white-listed for providing widgets across profiles.

2. Notify hosts in the group for provider changes when a profile
   is deleted.

bug:17126070

Change-Id: Ic719c1c68e45842d50decc95603f1d61583b8f02
2014-08-20 20:25:10 +00:00
Selim Cinek
522cb106dc am 65dbc328: am 53006cab: am cc19946d: Added notification color to all system notifications
* commit '65dbc32814ed265a0c1adcd4100f80029402ef40':
  Added notification color to all system notifications
2014-08-20 13:59:14 +00:00
Selim Cinek
255dd04271 Added notification color to all system notifications
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
2014-08-20 14:25:18 +02:00
Julia Reynolds
afe7a2c9c3 Merge "Prevent profile owners from setting certain user restrictions." into lmp-dev 2014-08-16 04:03:42 +00:00
Julia Reynolds
2cb384f425 Prevent profile owners from setting certain user restrictions.
Bug: 16351901
Bug: 16701492
Change-Id: Ie866bc24d2d7cc15f86c5b50062a730e099612a1
2014-08-20 16:06:29 -04:00
Jason Monk
45c3597975 resolved conflicts for merge of 8e6b5343 to master
Change-Id: Iece54064b2667b45febd0bffbf602be0fe58ae6d
2014-08-18 11:05:17 -04:00
Jason Monk
95d9ad0f79 Merge "Fixes to lock task API from API review" into lmp-dev 2014-08-16 04:32:18 +00:00
Julia Reynolds
34b5930fc3 resolved conflicts for merge of 9ef71fb5 to master
Change-Id: I5b03835eddb1d0f5f3d93814732213458d5cd5d2
2014-08-15 20:26:42 -04:00
Julia Reynolds
d438deffad Merge "Apply lockdowns when user restrictions are set." into lmp-dev 2014-08-15 19:03:20 +00:00
Julia Reynolds
3d9eb78fe9 Apply lockdowns when user restrictions are set.
Previously DMAgent would apply these lockdowns before/
after setting the matching user restrictions.

Bug: 16701642
Bug: 16945830
Bug: 16944983
Change-Id: Ib4f7145055687f12408d6ccacd8e6380406a32b2
2014-08-15 16:16:38 -04:00
Narayan Kamath
a223cd8d1d am 07d033e9: am 5fb6ef85: am 09e5ce88: Merge "Remove system_server classes from the boot image." into lmp-dev
* commit '07d033e91b824417da9a605f8d0fabdb1d167b67':
  Remove system_server classes from the boot image.
2014-08-15 13:40:39 +00:00
Narayan Kamath
29564cd245 Remove system_server classes from the boot image.
We set the system_server classpath in the environment
(like we do with BOOTCLASSPATH). After the zygote forks
the system_server, we dexopt the classpath (if needed)
and then launch the system server with the correct
PathClassLoader. This needed several small / medium
refactorings :

- The logic for connecting to installd is now in a separate
  class and belongs in the system_server.
- SystemService / SystemServiceManager have now moved to
  classes.jar. They are only used from there, and since they
  use Class.forName, we want them to be loaded by the
  system_server classloader, and not the bootclassloader.
- BootReceiver now moves to frameworks.jar, because it is
  used by ActivityThread and friends.

bug: 16555230

Change-Id: Ic84f0b2baf611eeedff6d123cb7191bb0259e600
2014-08-15 13:37:03 +01:00
Jason Monk
48aacba761 Fixes to lock task API from API review
Adding ComponentNames and some splitting/renaming of broadcasts.

Bug: 17005622
Change-Id: I9ece3553310fb20b0c3c3e4032b408e86384363a
2014-08-14 11:37:58 -04:00
Adrian Roos
b0b8e700c5 am abd9de9f: am 388b2e22: am c23b9298: Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev
* commit 'abd9de9fe450679e539d103ab9d2ea64fd1d50a2':
  Fix NPE in DevicePolicyManagerService that crashed SystemUI
2014-08-07 14:20:49 +00:00
Esteban Talavera
62b24865c1 am 48ecef05: am 25759079: am cc22fede: Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev
* commit '48ecef05b8b0998ab1bcb9e1729730b7fa4067de':
  Wipe only managed profile when max number of incorrect passwords exceeded
2014-08-07 10:13:02 +00:00
Svetoslav
e2ea689216 am 21775d29: am 435cc61f: am 216fe6da: Merge "Fix NPE in device policy manager service." into lmp-dev
* commit '21775d29c2f42d6e469f3bdeb5d873c63c6c591d':
  Fix NPE in device policy manager service.
2014-08-07 02:20:00 +00:00