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

Commit aa3dc53d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE"

parents 6b2f2ab2 d7d4ec22

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)) {