Merge "Don't wipe PST partition if OEM unlock is enabled" into lmp-dev

2014-08-07 17:33:58 +00:00
parent b1e7688aef ae58323a6b
commit ff150032e3
1 changed files with 4 additions and 1 deletions
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -65,7 +65,10 @@ public class MasterClearConfirm extends Fragment {
                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

            if (pdbManager != null) {
-                pdbManager.wipe();
+                // if OEM unlock is enabled, this will be wiped during FR process.
+                if (!pdbManager.getOemUnlockEnabled()) {
+                    pdbManager.wipe();
+                }
            }

            if (mEraseSdCard) {