Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8562a7a1 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

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

* commit 'eedf2fe0':
  Fix NPE if FPE service does not exist.
parents 0ad58dec eedf2fe0

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

+3 −1
Original line number Diff line number Diff line
@@ -3031,8 +3031,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    }

                    PersistentDataBlockManager manager = (PersistentDataBlockManager)

                            mContext.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

                    if (manager != null) {

                        manager.wipe();

                    }

                }

                boolean wipeExtRequested = (flags & WIPE_EXTERNAL_STORAGE) != 0;

                wipeDeviceOrUserLocked(wipeExtRequested, userHandle,

                        "DevicePolicyManager.wipeData() from " + source);