diff options
author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 17:27:39 +0100 |
---|---|---|
committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 17:27:39 +0100 |
commit | 652ad25a777d0a6196b7a3d6f34a7d23ac9e69f1 (patch) | |
tree | d00fbc8c84b1a040e4f16e2a1317ab3ff4b37137 /packages/Keyguard | |
parent | b7043f96c4deb8173e4f4c3a3293bbd646b59f12 (diff) | |
download | frameworks_base-652ad25a777d0a6196b7a3d6f34a7d23ac9e69f1.zip frameworks_base-652ad25a777d0a6196b7a3d6f34a7d23ac9e69f1.tar.gz frameworks_base-652ad25a777d0a6196b7a3d6f34a7d23ac9e69f1.tar.bz2 |
Revert "Keyguard: switch to cm-specific device provisioned flag"
This reverts commit ab5c226f688080d714f3eee987bd97e13cc348d5.
Diffstat (limited to 'packages/Keyguard')
-rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index e67ad20..33f8da8 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -69,8 +69,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map.Entry; -import cyanogenmod.providers.CMSettings; - import static android.os.BatteryManager.BATTERY_HEALTH_UNKNOWN; import static android.os.BatteryManager.BATTERY_STATUS_FULL; import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN; @@ -1132,8 +1130,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } private boolean isDeviceProvisionedInSettingsDb() { - return CMSettings.Secure.getInt(mContext.getContentResolver(), - CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED, 0) != 0; + return Settings.Global.getInt(mContext.getContentResolver(), + Settings.Global.DEVICE_PROVISIONED, 0) != 0; } private void watchForDeviceProvisioning() { @@ -1150,7 +1148,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { }; mContext.getContentResolver().registerContentObserver( - CMSettings.System.getUriFor(CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED), + Settings.Global.getUriFor(Settings.Global.DEVICE_PROVISIONED), false, mDeviceProvisionedObserver); // prevent a race condition between where we check the flag and where we register the |