diff options
| author | Craig Lafayette <craiglafa@google.com> | 2015-05-07 10:24:02 -0400 |
|---|---|---|
| committer | Craig Lafayette <craiglafa@google.com> | 2015-05-07 10:24:02 -0400 |
| commit | 4e401fa49875e083d18b46e0250be37ad565071c (patch) | |
| tree | 041b12e1444e73dd830c59cab8bf30146a8c926c /services | |
| parent | dbf62ace0dcb671f5eaa97c0dfa75e39bc9c88be (diff) | |
| download | frameworks_base-4e401fa49875e083d18b46e0250be37ad565071c.zip frameworks_base-4e401fa49875e083d18b46e0250be37ad565071c.tar.gz frameworks_base-4e401fa49875e083d18b46e0250be37ad565071c.tar.bz2 | |
DevicePolicyManager API review changes
Renamed DO_NOT_ASK_CREDENTIALS_ON_BOOT to
RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT.
Bug: 20820907
Change-Id: I6455f9a6d370afbd5154505f402b409dba3b7918
Diffstat (limited to 'services')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 6f01ca0..67c198f 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -2897,7 +2897,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { boolean callerIsDeviceOwnerAdmin = isCallerDeviceOwnerOrInitializer(callingUid); boolean doNotAskCredentialsOnBoot = - (flags & DevicePolicyManager.DO_NOT_ASK_CREDENTIALS_ON_BOOT) != 0; + (flags & DevicePolicyManager.RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT) != 0; if (callerIsDeviceOwnerAdmin && doNotAskCredentialsOnBoot) { setDoNotAskCredentialsOnBoot(); } |