commit 7b364e515c89ea1e8cb4d70ad3f25504bdeac3e8
author Cole Faust <colefaust@google.com> Mon Sep 26 16:24:58 2022 -0700
committer Cole Faust <colefaust@google.com> Tue Sep 27 00:16:50 2022 +0000
tree c5310eb5305234fa34d93a64f950e33b549398b4
parent 766bd4cedbd00fe300f8eb693001395c380fc067

Add null checks

Lint is being updated, and a type that used to be non-null
is now nullable, and needs to be null checked.

Bug: 247885568
Test: Presubmits
Change-Id: I7fc09a9d2d312485071364279c448550e3a1e124
Merged-In: Ie6eaf061d74bd773742aa47f731e95e4b137f438

tools/lint/checks/src/main/java/com/google/android/lint/EnforcePermissionDetector.kt

diff --git a/tools/lint/checks/src/main/java/com/google/android/lint/EnforcePermissionDetector.kt b/tools/lint/checks/src/main/java/com/google/android/lint/EnforcePermissionDetector.kt
index 8011b36..8f553ab 100644
--- a/tools/lint/checks/src/main/java/com/google/android/lint/EnforcePermissionDetector.kt
+++ b/tools/lint/checks/src/main/java/com/google/android/lint/EnforcePermissionDetector.kt
@@ -65,8 +65,16 @@
             if (attr1[i].name != attr2[i].name) {
                 return false
             }
-            val v1 = ConstantEvaluator.evaluate(context, attr1[i].value)
-            val v2 = ConstantEvaluator.evaluate(context, attr2[i].value)
+            val value1 = attr1[i].value
+            val value2 = attr2[i].value
+            if (value1 == null && value2 == null) {
+                continue
+            }
+            if (value1 == null || value2 == null) {
+                return false
+            }
+            val v1 = ConstantEvaluator.evaluate(context, value1)
+            val v2 = ConstantEvaluator.evaluate(context, value2)
             if (v1 != v2) {
                 return false
             }