commit 2e77ad99c6d5403f8fae037b70e78b5281cfc46c
author Cole Faust <colefaust@google.com> Tue Sep 27 16:35:46 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 27 16:35:46 2022 +0000
tree 36f8b98382e8840bbb602bf922b28b69b52b32e7
parent 3023a3345543c8b4bced0cf98c5084ca9b884451
parent 7b364e515c89ea1e8cb4d70ad3f25504bdeac3e8

Merge "Add null checks"

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
             }