diff options
| author | 2022-02-07 16:05:45 +0000 | |
|---|---|---|
| committer | 2022-02-07 16:05:45 +0000 | |
| commit | 48caf9d6a1857fc04773028197028d6e28dfb55e (patch) | |
| tree | fd445fcffc6a074c1c718ead992012facad44228 | |
| parent | d478d792e05919c1e046ee40cb3c2391ff83ad88 (diff) | |
| parent | 2e7197c2ae0a5983e86d9dacb0ce5357c5873c3e (diff) | |
Merge "Fix possible NPE in DPMS."
| -rw-r--r-- | services/Android.bp | 1 | ||||
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/services/Android.bp b/services/Android.bp index c5e32ea11ce6..2bd8c1af1d06 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -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/", diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 846577034ca8..b9da2cdeb2e0 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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; } } |