diff options
| author | Paul Crowley <paulcrowley@google.com> | 2015-03-25 11:43:42 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-03-25 18:49:46 -0700 |
| commit | b298ba3fa8434c20de557a5ababbfac63625b897 (patch) | |
| tree | 16bb42685f11f0423573c729b43e7a1d5f7ae5cb | |
| parent | a6f3009942a8d004b30a55dca5b3f7291bb09e38 (diff) | |
| download | base-b298ba3fa8434c20de557a5ababbfac63625b897.tar.gz | |
Fix NPE if FPE service does not exist.
Bug: 19846662
Change-Id: I44e014c66a524b282cce0cfc9b7513fc0f553576
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 40e2056cb73a..ec1258c610b6 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 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } 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, |