Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d44fe6f authored by Russell Brenner's avatar Russell Brenner Committed by android-build-merger
Browse files

Merge "Preserve FRP lock if wiped during SUW" into mnc-dev am: f0ff1631 

am: 2075d98b

* commit '2075d98b':
  Preserve FRP lock if wiped during SUW
parents 773b8a3c 2075d98b

src/com/android/settings/MasterClearConfirm.java

+7 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.ProgressDialog; 
import android.content.Context;

import android.content.pm.ActivityInfo;

import android.os.AsyncTask;

import android.provider.Settings;

import android.service.persistentdata.PersistentDataBlockManager;



import com.android.internal.logging.MetricsLogger;
@@ -63,8 +64,12 @@ public class MasterClearConfirm extends InstrumentedFragment { 
            final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)

                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);



            if (pdbManager != null && !pdbManager.getOemUnlockEnabled()) {

                // if OEM unlock is enabled, this will be wiped during FR process.

            if (pdbManager != null && !pdbManager.getOemUnlockEnabled() &&

                    Settings.Global.getInt(getActivity().getContentResolver(),

                            Settings.Global.DEVICE_PROVISIONED, 0) != 0) {

                // if OEM unlock is enabled, this will be wiped during FR process. If disabled, it

                // will be wiped here, unless the device is still being provisioned, in which case

                // the persistent data block will be preserved.

                new AsyncTask<Void, Void, Void>() {

                    int mOldOrientation;

                    ProgressDialog mProgressDialog;