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

Commit 0afd1905 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

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

parents 862f5900 a23995c2

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);