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

Commit 975e782d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am:... 

Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d am: 45918b72 am: e1858cab

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212



Change-Id: I4b486b4da6d99522ab004876fb1abdc2f45766dc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5007841e e1858cab

src/com/android/settings/MainClearConfirm.java

+6 −5
Original line number Diff line number Diff line
@@ -86,13 +86,14 @@ public class MainClearConfirm extends InstrumentedFragment { 
                return;

            }



            final PersistentDataBlockManager pdbManager;

            // pre-flight check hardware support PersistentDataBlockManager

            if (SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("")) {

                return;

            }



            final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)

            if (!SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("")) {

                pdbManager = (PersistentDataBlockManager)

                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

            } else {

                pdbManager = null;

            }



            if (shouldWipePersistentDataBlock(pdbManager)) {