diff options
| author | Andres Morales <anmorales@google.com> | 2014-08-06 17:01:19 -0700 |
|---|---|---|
| committer | Andres Morales <anmorales@google.com> | 2014-08-07 00:03:31 +0000 |
| commit | ae58323a6b172f4a8607e6b187ea5c45b9b8e185 (patch) | |
| tree | 3e724ce973fdeb01524b68c7820cddc75d15b66d /src/com/android/settings/MasterClearConfirm.java | |
| parent | f34c3501948190acf44defefba8eb161ec6dc07b (diff) | |
| download | packages_apps_Settings-ae58323a6b172f4a8607e6b187ea5c45b9b8e185.zip packages_apps_Settings-ae58323a6b172f4a8607e6b187ea5c45b9b8e185.tar.gz packages_apps_Settings-ae58323a6b172f4a8607e6b187ea5c45b9b8e185.tar.bz2 | |
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
Diffstat (limited to 'src/com/android/settings/MasterClearConfirm.java')
| -rw-r--r-- | src/com/android/settings/MasterClearConfirm.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 @@ 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) { |