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
Bug: 249337906
Bug: 249335143
Test: Presubmits
Change-Id: I3efc2d206a17a58dbff4306c98666cb4b06b0de7
This commit is contained in:
Cole Faust
2022-09-27 13:08:56 -07:00
parent 85a6ce0604
commit 8ed095c389
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/aidl/EnforcePermissionDetector.kt
View File

@@ -82,8 +82,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
}