commit aa3dc53d977a639b220d0ad93932acb9f50546c5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jun 20 12:13:34 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 20 12:13:34 2023 +0000
tree ec14445f63c97153e2396d4009ef2388e1755d5c
parent 6b2f2ab2054d8413f7435fda6c9e0fd8ec00c4db
parent d7d4ec224f9d6921c9f7f51bce65e4c8d30157f0

Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE"

src/com/android/settings/MainClearConfirm.java

diff --git a/src/com/android/settings/MainClearConfirm.java b/src/com/android/settings/MainClearConfirm.java
index 9208c4f..e42c3a1 100644
--- a/src/com/android/settings/MainClearConfirm.java
+++ b/src/com/android/settings/MainClearConfirm.java
@@ -86,13 +86,14 @@
                 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)) {