diff options
| -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; } } |