Commit Graph

146 Commits

Author SHA1 Message Date
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
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
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
Esteban Talavera
00f201e41b Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev 2014-08-05 00:35:13 +00:00
Esteban Talavera
fe0f24cc92 Wipe only managed profile when max number of incorrect passwords exceeded
When the maximum number of retries that has been exceeded is not for the primary profile of the user, wipe only the profile that set that policy (e.g. the managed profile) rather than the entire user. At the moment the whole device is wiped if the max number of incorrect passwords for a managed profile is reached, as the password is shared with the USER_OWNER.

Bug: 14453697
Change-Id: I5746de104133c0ea0a51d75b9c92e1516d365d8c
2014-08-06 18:10:16 +01:00
Svetoslav
318f91b784 Fix NPE in device policy manager service.
Change-Id: I796359f903077eb0ef825ed926557f1a13b2e4c4
2014-08-06 19:05:57 -07:00
Svetoslav
39999cf026 Allow adding widgets from user profiles.
The goal of this change is to enable support for appwidget from
user profiles to the user main profile. A user profile is a user
which is associated as a child of the main user profile. For example,
a user may have a personal (parent) and corporate (child) profile.
The device policy should be able to control whether adding a widget
from a child profile and given packages is allowed. This change
assumes that all packages from managed profiles are white listed.
Another change will add the device policy changes.

(cherrypicked 8cd27c3c to work around Gerrit issue)

Change-Id: I267260b55d74c48b112a29979a9f59eef7a8194e
2014-08-06 11:01:36 +01:00
Adrian Roos
b8b4774e61 Fix NPE in DevicePolicyManagerService that crashed SystemUI
Bug: 16857795
Change-Id: I6234f03c4ee31311af9f9c556b790594ee1a8b2f
2014-08-07 15:55:21 +02:00
Svetoslav
976e8bd201 Allow adding widgets from user profiles.
The goal of this change is to enable support for appwidget from
user profiles to the user main profile. A user profile is a user
which is associated as a child of the main user profile. For example,
a user may have a personal (parent) and corporate (child) profile.
The device policy should be able to control whether adding a widget
from a child profile and given packages is allowed. This change
assumes that all packages from managed profiles are white listed.
Another change will add the device policy changes.

Change-Id: I267260b55d74c48b112a29979a9f59eef7a8194e
2014-08-05 20:57:20 +00:00
Sander Alewijnse
2310acbcc6 am c772b60a: am 1d7e62b7: am 9d032110: Fix deadlock window manager and device policy manager.
* commit 'c772b60a94a2b3cb024be01bafd3a35b702f8eb1':
  Fix deadlock window manager and device policy manager.
2014-07-31 13:42:05 +00:00
Sander Alewijnse
a87863a8bd Fix deadlock window manager and device policy manager.
Removed all communication from wm to device policy manager.
Added initialization of cache in wm by dpms.

Change-Id: Ifa0b8bfcd625464b156d5cc0fb66d342deda1c27
2014-07-31 09:16:46 +00:00
Bernhard Bauer
8989964ee3 Add a method to DevicePolicyManager to silently install a certificate / private key pair.
BUG=15065444

Change-Id: Id3d255e1fce2c608501c3a038633a93c7f191426
2014-07-31 09:30:13 +01:00
Bernhard Bauer
ee0c1f5898 Remove a method from DevicePolicyManagerService that slipped in by accident.
Change-Id: Ic4db8055e890ca666895fb92dbf957c7d9f394d7
2014-07-30 18:06:39 +01:00
Robin Lee
059c83ce02 am a25bd32c: am 9011c4e7: am e6818f08: Merge "Don\'t turn off screen after wiping user profiles" into lmp-dev
* commit 'a25bd32c51c145cbf21e4842e1a8207e644483ee':
  Don't turn off screen after wiping user profiles
2014-07-30 16:54:10 +00:00
Amith Yamasani
e2013c5dc7 am f77c4da3: am 8d072bf2: am e257f1ee: Set profile owner via an intent
* commit 'f77c4da31c808ac48eb4dc96c8f9283ac159e496':
  Set profile owner via an intent
2014-07-30 16:51:54 +00:00