diff options
| author | Craig Lafayette <craiglafa@google.com> | 2015-05-08 19:55:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 19:55:34 +0000 |
| commit | 4ca9955d39009bffdbae0a630478c06315cfe714 (patch) | |
| tree | 887f90b6dbeaedbdbac902b967064464cbf63ae2 /services | |
| parent | f4cf03dcca8408dbcffb5737a84792bd2dc6a5e0 (diff) | |
| parent | 4e401fa49875e083d18b46e0250be37ad565071c (diff) | |
| download | frameworks_base-4ca9955d39009bffdbae0a630478c06315cfe714.zip frameworks_base-4ca9955d39009bffdbae0a630478c06315cfe714.tar.gz frameworks_base-4ca9955d39009bffdbae0a630478c06315cfe714.tar.bz2 | |
Merge "DevicePolicyManager API review changes" into mnc-dev
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(); } |