diff options
| author | cretin45 <cretin45@gmail.com> | 2015-09-01 16:19:32 -0700 |
|---|---|---|
| committer | Ed Carrigan <cretin45@gmail.com> | 2015-09-01 16:32:48 -0700 |
| commit | 97c37bef11831dc867ff0c3b9d8cf6804127019f (patch) | |
| tree | 7cba37c8f6406a95caedb64bc4b50050ebb3f0ce /src/com | |
| parent | 9ce4c4f0d6377c88ed67797414da38feff9f0b23 (diff) | |
| download | packages_apps_SetupWizard-97c37bef11831dc867ff0c3b9d8cf6804127019f.zip packages_apps_SetupWizard-97c37bef11831dc867ff0c3b9d8cf6804127019f.tar.gz packages_apps_SetupWizard-97c37bef11831dc867ff0c3b9d8cf6804127019f.tar.bz2 | |
SetupWizard: Check for frp in finish receiver
CYNGNOS-886
Change-Id: I97af3285d9321f2f153676eaac081e5408300661
Diffstat (limited to 'src/com')
| -rw-r--r-- | src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java | 2 | ||||
| -rw-r--r-- | src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java b/src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java index fdd77a2..d3db8ff 100644 --- a/src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java +++ b/src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java @@ -13,7 +13,7 @@ public class FinishSetupReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - if (SetupWizardUtils.isDeviceLocked()) { + if (SetupWizardUtils.isDeviceLocked() || SetupWizardUtils.frpEnabled(context)) { return; } Settings.Global.putInt(context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1); diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java index c802335..a723923 100644 --- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java +++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java @@ -30,6 +30,7 @@ import android.os.IBinder; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; +import android.service.persistentdata.PersistentDataBlockManager; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; @@ -142,6 +143,14 @@ public class SetupWizardUtils { return false; } + public static boolean frpEnabled(Context context) { + final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager) + context.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE); + return pdbManager != null + && pdbManager.getDataBlockSize() > 0 + && !pdbManager.getOemUnlockEnabled(); + } + public static boolean hasKillSwitch() { IBinder b = ServiceManager.getService(Context.KILLSWITCH_SERVICE); IKillSwitchService service = IKillSwitchService.Stub.asInterface(b); |