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

Commit 483efe1e authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Add null checks" am: 2e77ad99 am: 6eda1f24 am: 691e8c1e am: 3272f72e 

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



Change-Id: Ifa8527fbe5790ee2c20572e2903e16e7b16001d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c0f8c735 3272f72e

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

            }