Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE" am: aa3dc53d97
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2629212
Change-Id: I11e6110ba0b640be8b373d9afd45f806c005b05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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)) {