commit 2e7197c2ae0a5983e86d9dacb0ce5357c5873c3e
author Michael Wright <michaelwr@google.com> Fri Feb 04 19:00:44 2022 +0000
committer Michael Wright <michaelwr@google.com> Fri Feb 04 21:17:09 2022 +0000
tree a3d700a575f5789f7bd84150139695e55772ee51
parent 010aa30bc459f2f1df717b0c09928a0ce366193b

Fix possible NPE in DPMS.

If there's no ActiveAdmin for the given user then the ternary
expression would return null, which immediately will throw an NPE as it
gets auto-unboxed into from Boolean to boolean.

Bug: 217923092
Test: errorprone build
Change-Id: I4043f0061e5a23e4d5aa408917f6d51b8bbf22ec

services/Android.bp

diff --git a/services/Android.bp b/services/Android.bp
index c8b4969..4623ff9 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -17,6 +17,7 @@
             "-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/",