Merge "Allow factory reset without PERSISTENT_DATA_BLOCK_SERVICE"
This commit is contained in:
@@ -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)) {
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user