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

Commit a58d63cf 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 am: 975e782d

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



Change-Id: I9294386b4cec4e05c6d843420313dc52a74efa9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d97a38be 975e782d

src/com/android/settings/MainClearConfirm.java

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

                return;

            }

            }





            final PersistentDataBlockManager pdbManager;

            // pre-flight check hardware support PersistentDataBlockManager

            // pre-flight check hardware support PersistentDataBlockManager

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

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

                return;

                pdbManager = (PersistentDataBlockManager)

            }



            final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)

                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

            } else {

                pdbManager = null;

            }





            if (shouldWipePersistentDataBlock(pdbManager)) {

            if (shouldWipePersistentDataBlock(pdbManager)) {