commit 8562a7a110a0b012c33047884594cd4c449b27d0
author Amith Yamasani <yamasani@google.com> Wed Mar 25 22:25:51 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 25 22:25:51 2015 +0000
tree d0662c7710fa7525596a5b312203fe2b7f708300
parent 0ad58deca1bea95ea052ec2c4257bdf62d53fd54
parent eedf2fe04a94c13c4548082a3675c6888293ef4e

am eedf2fe0: am 0afd1905: Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev

* commit 'eedf2fe04a94c13c4548082a3675c6888293ef4e':
  Fix NPE if FPE service does not exist.

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

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,