summaryrefslogtreecommitdiffstats
path: root/services/devicepolicy/java/com/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Device Policy API to choose a private key silently"Robin Lee2015-02-161-0/+54
|\
| * Device Policy API to choose a private key silentlyRobin Lee2015-02-051-0/+54
* | Merge "Avoid NullPointerException in enableSystemApp if the app is absent."Nicolas Prevot2015-02-111-0/+4
|\ \
| * | Avoid NullPointerException in enableSystemApp if the app is absent.Nicolas Prevot2015-02-101-0/+4
* | | Dont throw an exception for non-system apps when enabling system apps.Nicolas Prevot2015-02-111-8/+7
|/ /
* | am a2ced3e8: am 8d12d3da: Merge "Only switch user if current user is being wi...Kenny Guy2015-02-051-1/+4
|\ \ | |/ |/|
| * Only switch user if current user is being wipedKenny Guy2015-02-041-1/+4
* | Merge "Removed userHandle from setXXX methods"Fyodor Kupolov2015-01-301-45/+41
|\ \
| * | Removed userHandle from setXXX methodsFyodor Kupolov2015-01-291-45/+41
* | | Move mute/unmute handling to adjust volume pathsRoboErik2015-01-291-4/+8
|/ /
* | am ad664808: am 6d16b861: Merge "Avoid NullPointerException if createUser ret...Benjamin Franz2015-01-261-0/+3
|\ \ | |/
| * Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-devBenjamin Franz2015-01-261-0/+3
| |\
| | * Avoid NullPointerException if createUser returns nullBenjamin Franz2015-01-231-0/+3
* | | am 20bd0c23: am 059b8ab6: am 414ea81e: Merge "Ensure notifications are sent w...Zoltan Szatmary-Ban2015-01-261-0/+13
|\ \ \ | |/ /
| * | Merge "Ensure notifications are sent when locking/unlocking location share" i...Zoltan Szatmary-Ban2015-01-261-0/+13
| |\ \ | | |/ | |/|
| | * Ensure notifications are sent when locking/unlocking location shareZoltan Szatmary-Ban2015-01-231-0/+13
* | | am bfca5f40: am 266303fd: Merge "Avoid SecurityException when calling getUser...Benjamin Franz2015-01-231-21/+42
|\ \ \ | |/ /
| * | 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
* | | am 4be433dc: am 10dd6eef: am fd846dfb: Merge "Sync file before using Journale...Kenny Guy2015-01-161-0/+3
|\ \ \ | |/ /
| * | 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
* | Explicitly specify user on LPU's private methodsAdrian Roos2015-01-081-2/+2
* | Purge biometric weak and keyguard widgetsAdrian Roos2015-01-071-2/+2
* | am 26e2da8f: am 374c358d: Merge "Profile owner hint in warning for extra CAs"...Robin Lee2015-01-071-1/+4
|\ \ | |/
| * Profile owner hint in warning for extra CAsRobin Lee2015-01-051-1/+4
* | Merge "Remove deprecated version of setProfileOwner that takes packageName"Esteban Talavera2014-12-291-32/+7
|\ \
| * | Remove deprecated version of setProfileOwner that takes packageNameEsteban Talavera2014-12-241-32/+7
* | | am b4b14e39: Merge "Revert "DevicePolicy: Don\'t warn about managed profile C...Robin Lee2014-12-281-6/+0
|\ \ \ | |/ / |/| / | |/
| * 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
* | | am d483a85e: am fed2812d: am 22afe626: Merge "Added isRemovingAdmin method" i...Fyodor Kupolov2014-12-091-2/+23
|\ \ \ | |/ /
| * | Merge "Added isRemovingAdmin method" into lmp-mr1-devFyodor Kupolov2014-12-051-2/+23
| |\ \
| | * | Added isRemovingAdmin methodFyodor Kupolov2014-12-041-2/+23
* | | | am 81b27f4c: am b2905092: am 0702752c: Merge "Potential fix for accidental de...Amith Yamasani2014-12-091-10/+20
|\ \ \ \ | |/ / /
| * | | Potential fix for accidental deactivation of profile ownerAmith Yamasani2014-12-041-10/+20
| |/ /
* | | am 0d122e26: am ba94fd5e: am 77e25331: Merge "Add flag for wiping factory res...Paul Crowley2014-11-261-17/+25
|\ \ \ | |/ /
| * | 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
* | | am a7ffed86: am cc19e8b8: am 692e4933: Merge "DevicePolicy: Don\'t warn about...Robin Lee2014-11-261-4/+8
|\ \ \ | |/ /
| * | DevicePolicy: Don't warn about managed profile CAsRobin Lee2014-11-251-4/+8
| |/
* | am 9a4d0257: am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into...Adrian Roos2014-11-251-2/+9
|\ \ | |/
| * Merge "Fix DPM.resetPassword("")" into lmp-mr1-devAdrian Roos2014-11-241-2/+9
| |\
| | * Fix DPM.resetPassword("")Adrian Roos2014-11-211-2/+9
* | | am 1f26bf6b: am 108bdbc9: am efb2df69: Merge "Different messages when wiping ...Amith Yamasani2014-11-221-0/+13
|\ \ \ | |/ /
| * | Different messages when wiping user and not deviceAmith Yamasani2014-11-211-0/+13
* | | am 5c374a58: am b3d0580f: am 08229e81: Merge "Shutdown backup manager service...Zoltan Szatmary-Ban2014-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
generated by cgit v1.1 at 2024-12-24 04:52:26 +0000