summaryrefslogtreecommitdiffstats
path: root/services/devicepolicy/java/com
Commit message (Expand)AuthorAgeFilesLines
* Merge "Avoid SecurityException when calling getUserData" into lmp-mr1-devBenjamin Franz2015-01-231-21/+42
|\
| * Avoid SecurityException when calling getUserDataBenjamin Franz2015-01-221-21/+42
* | Sync file before using JournaledFile commit.Kenny Guy2015-01-151-0/+3
|/
* Profile owner hint in warning for extra CAsRobin Lee2015-01-091-1/+4
* Revert "Profile owner hint in warning for extra CAs"Robin Lee2015-01-081-4/+1
* Profile owner hint in warning for extra CAsRobin Lee2015-01-051-1/+4
* Merge "Revert "DevicePolicy: Don't warn about managed profile CAs"" into lmp-...Robin Lee2014-12-231-6/+0
|\
| * Revert "DevicePolicy: Don't warn about managed profile CAs"Robin Lee2014-12-221-6/+0
* | Merge "Added isRemovingAdmin method" into lmp-mr1-devFyodor Kupolov2014-12-051-2/+23
|\ \
| * | Added isRemovingAdmin methodFyodor Kupolov2014-12-041-2/+23
* | | Potential fix for accidental deactivation of profile ownerAmith Yamasani2014-12-041-10/+20
|/ /
* | Merge "Add flag for wiping factory reset protection data." into lmp-mr1-devPaul Crowley2014-11-251-17/+25
|\ \ | |/ |/|
| * Add flag for wiping factory reset protection data.Paul Crowley2014-11-251-17/+25
* | DevicePolicy: Don't warn about managed profile CAsRobin Lee2014-11-251-4/+8
|/
* Merge "Fix DPM.resetPassword("")" into lmp-mr1-devAdrian Roos2014-11-241-2/+9
|\
| * Fix DPM.resetPassword("")Adrian Roos2014-11-211-2/+9
* | Different messages when wiping user and not deviceAmith Yamasani2014-11-211-0/+13
* | Merge "Shutdown backup manager service when device owner is set" into lmp-mr1...Zoltan Szatmary-Ban2014-11-211-0/+13
|\ \
| * | Shutdown backup manager service when device owner is setZoltan Szatmary-Ban2014-11-131-0/+13
* | | Merge "Remove permission check in DevicePolicyManager.isUninstallBlocked()" i...Rubin Xu2014-11-181-3/+5
|\ \ \
| * | | Remove permission check in DevicePolicyManager.isUninstallBlocked()Rubin Xu2014-11-181-3/+5
| |/ /
* | | Merge "Fix equality test in getProfileOwnerAdmin()" into lmp-mr1-devRubin Xu2014-11-181-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix equality test in getProfileOwnerAdmin()Rubin Xu2014-10-301-1/+1
* | | Added synchronization to handlePackagesChanged methodFyodor Kupolov2014-11-121-15/+17
| |/ |/|
* | Allow profile owners to set the unknown source settingAmith Yamasani2014-11-111-0/+1
* | Move device admin max screen off timeout to internal interface.Jeff Brown2014-11-061-19/+9
* | Update TrustAgentService API after reviewJim Miller2014-11-051-66/+95
|/
* Merge "Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user ...Benjamin Franz2014-10-281-0/+1
|\
| * Send ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED Broadcast when a user restric...Benjamin Franz2014-10-221-0/+1
* | DevicePolicy: Restore CA warning to K behaviourRobin Lee2014-10-201-1/+0
* | Use the correct method to check if device is encryptedAmith Yamasani2014-10-171-3/+8
* | Fix getStorageEncryptionStatus() in DevicePolicyManagerJim Miller2014-10-151-1/+3
* | Merge "Fix admin policies in managed profiles" into lmp-devAmith Yamasani2014-10-151-4/+0
|\ \
| * | Fix admin policies in managed profilesAmith Yamasani2014-10-151-4/+0
| |/
* | Fix a NPE in device policy manager service.Svetoslav2014-10-141-0/+3
|/
* DevicePolicy: One cert tracker warning per profileRobin Lee2014-10-091-50/+82
* Merge "Ignore badly formed ComponentNames when loading device_owner.xml" into...Kenny Guy2014-09-251-4/+13
|\
| * Ignore badly formed ComponentNames when loading device_owner.xmlKenny Guy2014-09-251-4/+13
* | Include reason when wiping data.Jeff Sharkey2014-09-241-7/+23
|/
* Merge "Allow primary user profile owner to set device restrictions" into lmp-devAmith Yamasani2014-09-191-1/+2
|\
| * Allow primary user profile owner to set device restrictionsAmith Yamasani2014-09-181-1/+2
* | bug fix: Allow enableSystemApps to be called by profile and device owner.Jessica Hummel2014-09-191-13/+15
|/
* Prevent device owner registration after setup is completeAmith Yamasani2014-09-121-9/+7
* Merge "Add new adb dpm (= DevicePolicyManager) command" into lmp-devEsteban Talavera2014-09-121-4/+14
|\
| * Add new adb dpm (= DevicePolicyManager) commandEsteban Talavera2014-09-121-4/+14
* | Add DevicePolicyManager PrivateKey mgmtBernhard Bauer2014-09-111-3/+34
* | Merge "Apply cross-user restrictions to Shell" into lmp-devAmith Yamasani2014-09-111-11/+15
|\ \ | |/ |/|
| * Apply cross-user restrictions to ShellAmith Yamasani2014-09-101-11/+15
* | Merge "Allow device owners to update LOCATION_MODE." into lmp-devJulia Reynolds2014-09-111-3/+14
|\ \ | |/ |/|
| * Allow device owners to update LOCATION_MODE.Julia Reynolds2014-09-041-3/+14