commit ae58323a6b172f4a8607e6b187ea5c45b9b8e185
author Andres Morales <anmorales@google.com> Wed Aug 06 17:01:19 2014 -0700
committer Andres Morales <anmorales@google.com> Thu Aug 07 00:03:31 2014 +0000
tree 3e724ce973fdeb01524b68c7820cddc75d15b66d
parent f34c3501948190acf44defefba8eb161ec6dc07b

Don't wipe PST partition if OEM unlock is enabled

This will be wiped by the recovery system and the OEM
unlock bit will be retained.

Bug: 16631974
Change-Id: I65522dd93c8465ff7f7ecbcef404bff6e9c864d6

src/com/android/settings/MasterClearConfirm.java

diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 2ba1e7f..d14ad39 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -65,7 +65,10 @@
                     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) {