am 2d4b3e6b: am ff150032: Merge "Don\'t wipe PST partition if OEM unlock is enabled" into lmp-dev

* commit '2d4b3e6baf55266af606c5c8a86aa4d14c2cdeb9': Don't wipe PST partition if OEM unlock is enabled
2014-08-07 19:07:03 +00:00
parent f0fd4c2b38 2d4b3e6baf
commit b80fba0592
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) {