diff options
| -rw-r--r-- | src/com/android/settings/MasterClearConfirm.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java index 3521aa3140b..71837c6c8c4 100644 --- a/src/com/android/settings/MasterClearConfirm.java +++ b/src/com/android/settings/MasterClearConfirm.java @@ -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.os.storage.ExternalStorageFormatter; @@ -62,8 +63,12 @@ public class MasterClearConfirm extends Fragment { 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. final ProgressDialog progressDialog = getProgressDialog(); progressDialog.show(); |