Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff150032 authored by Andres Morales's avatar Andres Morales Committed by Android (Google) Code Review
Browse files

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

parents b1e7688a ae58323a

src/com/android/settings/MasterClearConfirm.java

+4 −1
Original line number Diff line number Diff line
@@ -65,8 +65,11 @@ public class MasterClearConfirm extends Fragment { 
                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);



            if (pdbManager != null) {

                // if OEM unlock is enabled, this will be wiped during FR process.

                if (!pdbManager.getOemUnlockEnabled()) {

                    pdbManager.wipe();

                }

            }



            if (mEraseSdCard) {

                Intent intent = new Intent(ExternalStorageFormatter.FORMAT_AND_FACTORY_RESET);