Fix issue where can't FR Volantis if OEM unlock is enabled

Bug: 17426800
Change-Id: I02340d1ec4b80d9e3b05d35d36653c6ff4ff3232

src/com/android/settings/MasterClearConfirm.java

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