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

Commit ff8a6801 authored by Russell Brenner's avatar Russell Brenner
Browse files

resolve merge conflicts of 7285e2c2 to master. 

Change-Id: I56ebcc0dac917791b19ee308eed30bb51267a817
parents e5f836b0 7285e2c2

src/com/android/settings/MasterClearConfirm.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.pm.ActivityInfo; 
import android.os.AsyncTask;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.Bundle;

import android.os.UserManager;

import android.os.UserManager;

import android.provider.Settings;

import android.service.persistentdata.PersistentDataBlockManager;

import android.service.persistentdata.PersistentDataBlockManager;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View;
@@ -62,8 +63,12 @@ public class MasterClearConfirm extends InstrumentedFragment { 
            final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)

            final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)

                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);





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

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

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

                    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>() {

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

                    int mOldOrientation;

                    int mOldOrientation;

                    ProgressDialog mProgressDialog;

                    ProgressDialog mProgressDialog;