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

Add null checks

Browse Source 
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
This commit is contained in:
Cole Faust
2022-09-26 16:24:58 -07:00
parent 766bd4cedb
commit 7b364e515c
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
}