Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://android.git.kernel.org/platform/frameworks/policies/base

Browse Source
This commit is contained in:
The Android Open Source Project
2009-01-16 14:41:08 -08:00
parent b96766569c 871f4ce2ee
commit f95e069508
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
policy/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
View File

@@ -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...

3
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -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;
}