Merge branch 'master' of git://android.git.kernel.org/platform/frameworks/policies/base (f95e0695) · Commits · e / os / android_frameworks_base

policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import static android.os.BatteryManager.BATTERY_STATUS_FULL;
		import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;
		import android.os.Handler;
		import android.os.Message;
		import android.os.SystemProperties;
		import android.provider.Settings;
		import android.provider.Telephony;
		import static android.provider.Telephony.Intents.EXTRA_PLMN;
		@@ -160,8 +161,12 @@ public class KeyguardUpdateMonitor {
		}
		};

		if (!SystemProperties.getBoolean("ro.requires_provisioning", false)) {
		mDeviceProvisioned = true;
		} else {
		mDeviceProvisioned = Settings.Secure.getInt(
		mContext.getContentResolver(), Settings.Secure.DEVICE_PROVISIONED, 0) != 0;
		}

		// Since device can't be un-provisioned, we only need to register a content observer
		// to update mDeviceProvisioned when we are...

+3 −0

Original line number	Diff line number	Diff line
		@@ -350,6 +350,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

		boolean isDeviceProvisioned() {
		if (!SystemProperties.getBoolean("ro.requires_provisioning", false)) {
		return true;
		}
		return Settings.Secure.getInt(
		mContext.getContentResolver(), Settings.Secure.DEVICE_PROVISIONED, 0) != 0;
		}