Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add null checks" am: 2e77ad99c6 am: 6eda1f24b6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2232549

Change-Id: I5f8cea00ef07d9d4dd80dd77d7a877105fb7b3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2022-09-27 17:47:59 +00:00
committed by Automerger Merge Worker
parent 68642fbca7 6eda1f24b6
commit 691e8c1e7b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,8 +65,16 @@ class EnforcePermissionDetector : Detector(), SourceCodeScanner {
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
}