PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue where can't FR Volantis if OEM unlock is enabled" into lmp-dev

Browse Source
This commit is contained in:
Andres Morales
2014-09-08 21:07:48 +00:00
committed by Android (Google) Code Review
parent 5fe30ea841 e6bf2a5609
commit 4fc50daefa
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/MasterClearConfirm.java
View File

@@ -62,9 +62,8 @@ public class MasterClearConfirm extends Fragment {
final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)
getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
if (pdbManager != null) {
if (pdbManager != null && !pdbManager.getOemUnlockEnabled()) {
// if OEM unlock is enabled, this will be wiped during FR process.
if (!pdbManager.getOemUnlockEnabled()) {
final ProgressDialog progressDialog = getProgressDialog();
progressDialog.show();
@@ -86,7 +85,6 @@ public class MasterClearConfirm extends Fragment {
doMasterClear();
}
}.execute();
}
} else {
doMasterClear();
}