From ab5c226f688080d714f3eee987bd97e13cc348d5 Mon Sep 17 00:00:00 2001 From: Roman Birg Date: Fri, 15 Apr 2016 13:18:29 -0700 Subject: Keyguard: switch to cm-specific device provisioned flag Ticket: CYNGNOS-2431 Change-Id: I2f47031f9fb2cc40e61a5f57d49e985104b14024 Signed-off-by: Roman Birg --- .../Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'packages/Keyguard') diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java index 5e09729..00300f6 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -69,6 +69,8 @@ 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; @@ -1088,8 +1090,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { } private boolean isDeviceProvisionedInSettingsDb() { - return Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.DEVICE_PROVISIONED, 0) != 0; + return CMSettings.Secure.getInt(mContext.getContentResolver(), + CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED, 0) != 0; } private void watchForDeviceProvisioning() { @@ -1106,7 +1108,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { }; mContext.getContentResolver().registerContentObserver( - Settings.Global.getUriFor(Settings.Global.DEVICE_PROVISIONED), + CMSettings.System.getUriFor(CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED), false, mDeviceProvisionedObserver); // prevent a race condition between where we check the flag and where we register the -- cgit v1.1