commit 0afd1905b59446fc471680325bcbea802bb37c5c
author Amith Yamasani <yamasani@google.com> Wed Mar 25 22:12:44 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 25 22:12:46 2015 +0000
tree eefceac71455bc0bb3d552cd45ef71735cbc1412
parent 862f5900e8abce1cc20979a4dca76e1f0b982880
parent a23995c233b3c336d0f405523902606f2583caea

Merge "Fix NPE if FPE service does not exist." into lmp-mr1-dev

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,