PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andres Morales
2014-08-07 17:33:58 +00:00
committed by Android (Google) Code Review
parent b1e7688aef ae58323a6b
commit ff150032e3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/MasterClearConfirm.java
View File

@@ -65,8 +65,11 @@ public class MasterClearConfirm extends Fragment {
getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE); getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
if (pdbManager != null) { if (pdbManager != null) {
// if OEM unlock is enabled, this will be wiped during FR process.
if (!pdbManager.getOemUnlockEnabled()) {
pdbManager.wipe(); pdbManager.wipe();
} }
}
if (mEraseSdCard) { if (mEraseSdCard) {
Intent intent = new Intent(ExternalStorageFormatter.FORMAT_AND_FACTORY_RESET); Intent intent = new Intent(ExternalStorageFormatter.FORMAT_AND_FACTORY_RESET);