commit | d3b6cbe172f429038894b1fae09fb72e8a646519 | [log] [tgz] |
---|---|---|
author | Pavel Zhamaitsiak <pavelz@google.com> | Wed Mar 25 22:52:36 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Mar 25 22:52:37 2015 +0000 |
tree | d323b55342f0f36338778de36554fc6a6c89f20a | |
parent | ce3153df56e4ed984b949869dd0ec97793f2c428 [diff] | |
parent | faf7ce03c2bb21b5f541f9e3e0e5b76de14ac7d3 [diff] |
Merge "IMS: UT ServiceClass" into lmp-mr1-wfc-dev
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 40e2056..ec1258c 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -3031,7 +3031,9 @@ } PersistentDataBlockManager manager = (PersistentDataBlockManager) mContext.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE); - manager.wipe(); + if (manager != null) { + manager.wipe(); + } } boolean wipeExtRequested = (flags & WIPE_EXTERNAL_STORAGE) != 0; wipeDeviceOrUserLocked(wipeExtRequested, userHandle,