From 871f4ce2eef7443237aa321d60a52cc011caeacf Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Thu, 15 Jan 2009 14:33:27 -0800 Subject: [PATCH] Optional provisioning This introduces an ro.requires_provisioning property, which defaults to false, such that by default the platform doesn't require any setup application to set a run-time "provisioned" bit and allows all behaviors right away (home key, lock screen, etc...). --- .../internal/policy/impl/KeyguardUpdateMonitor.java | 9 +++++++-- .../android/internal/policy/impl/PhoneWindowManager.java | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java b/policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java index 4671957592cca..a9f93566c6000 100644 --- a/policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java +++ b/policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java @@ -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 { } }; - mDeviceProvisioned = Settings.Secure.getInt( - mContext.getContentResolver(), Settings.Secure.DEVICE_PROVISIONED, 0) != 0; + 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... diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java index 603b2216e4183..2dcf81df7aa35 100644 --- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java @@ -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; }