Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b364e51 authored by Cole Faust's avatar Cole Faust
Browse files

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
parent 766bd4ce

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

+10 −2
Original line number Diff line number Diff line
@@ -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

            }