drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '0afd1905b59446fc471680325bcbea802bb37c5c':
  Fix NPE if FPE service does not exist.
This commit is contained in:
Amith Yamasani
2015-03-25 22:19:20 +00:00
committed by Android Git Automerger
parent 5f11a1af57 0afd1905b5
commit eedf2fe04a
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@ -3031,7 +3031,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
} }
PersistentDataBlockManager manager = (PersistentDataBlockManager) PersistentDataBlockManager manager = (PersistentDataBlockManager)
mContext.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE); mContext.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
manager.wipe(); if (manager != null) {
manager.wipe();
}
} }
boolean wipeExtRequested = (flags & WIPE_EXTERNAL_STORAGE) != 0; boolean wipeExtRequested = (flags & WIPE_EXTERNAL_STORAGE) != 0;
wipeDeviceOrUserLocked(wipeExtRequested, userHandle, wipeDeviceOrUserLocked(wipeExtRequested, userHandle,