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

Commit 48caf9d6 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Fix possible NPE in DPMS."

parents d478d792 2e7197c2

services/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ java_defaults { 
            "-Xep:AndroidFrameworkCompatChange:ERROR",

            // "-Xep:AndroidFrameworkUid:ERROR",

            "-Xep:SelfEquals:ERROR",

            "-Xep:NullTernary:ERROR",

            // NOTE: only enable to generate local patchfiles

            // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster",

            // "-XepPatchLocation:/tmp/refaster/",

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

+1 −1
Original line number Diff line number Diff line
@@ -6849,7 +6849,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
                String.format(NOT_SYSTEM_CALLER_MSG, "call isAlwaysOnVpnLockdownEnabledForUser"));

        synchronized (getLockObject()) {

            ActiveAdmin admin = getDeviceOrProfileOwnerAdminLocked(userHandle);

            return admin != null ? admin.mAlwaysOnVpnLockdown : null;

            return admin != null && admin.mAlwaysOnVpnLockdown;

        }

    }