PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-20 12:13:34 +00:00
committed by Gerrit Code Review
parent 6b2f2ab205 d7d4ec224f
commit aa3dc53d97
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/MainClearConfirm.java
View File

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