diff options
| author | Roman Birg <roman@cyngn.com> | 2015-03-06 11:07:04 -0800 |
|---|---|---|
| committer | Roman Birg <roman@cyngn.com> | 2015-03-06 11:07:04 -0800 |
| commit | 8ee26edf3e1834de077c99893e4963b8be8d5ebf (patch) | |
| tree | 46b22136acd842dfdd16d09903e9ea7a99b52a75 | |
| parent | 8d45da87803722adfc9d8f87e0ae669abc8fd649 (diff) | |
| download | android_frameworks_base-staging/LNX.LA.3.7.1.1.tar.gz android_frameworks_base-staging/LNX.LA.3.7.1.1.tar.bz2 android_frameworks_base-staging/LNX.LA.3.7.1.1.zip | |
DevicePolicyManager: synchronize calls to internal methodsstaging/LNX.LA.3.7.1.1
Change-Id: I8711c4fa73801d1cdeb754d2b667898c92383fef
Signed-off-by: Roman Birg <roman@cyngn.com>
| -rw-r--r-- | services/java/com/android/server/DevicePolicyManagerService.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index 9b32f535214..ec7f08e78c0 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -2740,15 +2740,17 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return false; } - int passwordQuality = getPasswordQuality(null, userHandle); - if (passwordQuality > DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) { - return true; - } + synchronized (this) { + int passwordQuality = getPasswordQuality(null, userHandle); + if (passwordQuality > DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) { + return true; + } - int encryptionStatus = getStorageEncryptionStatus(userHandle); - if (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE - || encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING) { - return true; + int encryptionStatus = getStorageEncryptionStatus(userHandle); + if (encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVE + || encryptionStatus == DevicePolicyManager.ENCRYPTION_STATUS_ACTIVATING) { + return true; + } } // Keystore.isEmpty() requires system UID |