diff options
| author | Andres Morales <anmorales@google.com> | 2014-08-07 17:33:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-06 23:49:20 +0000 |
| commit | ff150032e3c369513b0ba85b09aff1d8933c7ad3 (patch) | |
| tree | 4afbb4e1d8aefe3ec43af1375bfe6b05d20876ec | |
| parent | b1e7688aef258a4cd832b363ff7db632baabd13b (diff) | |
| parent | ae58323a6b172f4a8607e6b187ea5c45b9b8e185 (diff) | |
| download | packages_apps_Settings-ff150032e3c369513b0ba85b09aff1d8933c7ad3.zip packages_apps_Settings-ff150032e3c369513b0ba85b09aff1d8933c7ad3.tar.gz packages_apps_Settings-ff150032e3c369513b0ba85b09aff1d8933c7ad3.tar.bz2 | |
Merge "Don't wipe PST partition if OEM unlock is enabled" into lmp-dev
| -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) { |