ADHOC/replicant-packages_apps_SetupWizard
3
0
Fork 0
Code Issues Pull Requests Releases Activity

SetupWizard: Check for frp in finish receiver

Browse Source 
CYNGNOS-886

Change-Id: I97af3285d9321f2f153676eaac081e5408300661
This commit is contained in:
cretin45 2015-09-01 16:19:32 -07:00 committed by Ed Carrigan
parent 9ce4c4f0d6
commit 97c37bef11
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/cyanogenmod/setupwizard/setup/FinishSetupReceiver.java
View File

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

9
src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java
View File

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