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

Commit 32cbca56 authored by Cole Faust's avatar Cole Faust Committed by Automerger Merge Worker
Browse files

Merge "Fix crash in RequiresPermissionChecker.java" am: ede4a8a9 am: 484c0892 am: 6a088277 

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



Change-Id: I732e0c7497591d98489bc1d4e1d8ff4bc136ee0c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ae729515 6a088277

errorprone/java/com/google/errorprone/bugpatterns/android/RequiresPermissionChecker.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -412,11 +412,11 @@ public final class RequiresPermissionChecker extends BugChecker 




    private static ParsedRequiresPermission parseRequiresPermissionRecursively(

    private static ParsedRequiresPermission parseRequiresPermissionRecursively(

            MethodInvocationTree tree, VisitorState state) {

            MethodInvocationTree tree, VisitorState state) {

        if (ENFORCE_VIA_CONTEXT.matches(tree, state)) {

        if (ENFORCE_VIA_CONTEXT.matches(tree, state) && tree.getArguments().size() > 0) {

            final ParsedRequiresPermission res = new ParsedRequiresPermission();

            final ParsedRequiresPermission res = new ParsedRequiresPermission();

            res.allOf.add(String.valueOf(ASTHelpers.constValue(tree.getArguments().get(0))));

            res.allOf.add(String.valueOf(ASTHelpers.constValue(tree.getArguments().get(0))));

            return res;

            return res;

        } else if (ENFORCE_VIA_CHECKER.matches(tree, state)) {

        } else if (ENFORCE_VIA_CHECKER.matches(tree, state) && tree.getArguments().size() > 1) {

            final ParsedRequiresPermission res = new ParsedRequiresPermission();

            final ParsedRequiresPermission res = new ParsedRequiresPermission();

            res.allOf.add(String.valueOf(ASTHelpers.constValue(tree.getArguments().get(1))));

            res.allOf.add(String.valueOf(ASTHelpers.constValue(tree.getArguments().get(1))));

            return res;

            return res;

errorprone/tests/java/com/google/errorprone/bugpatterns/android/RequiresPermissionCheckerTest.java

+23 −0
Original line number Original line Diff line number Diff line
@@ -415,4 +415,27 @@ public class RequiresPermissionCheckerTest { 
                        "}")

                        "}")

                .doTest();

                .doTest();

    }

    }



    @Test

    public void testInvalidFunctions() {

        compilationHelper

                .addSourceFile("/android/annotation/RequiresPermission.java")

                .addSourceFile("/android/annotation/SuppressLint.java")

                .addSourceFile("/android/content/Context.java")

                .addSourceLines("Example.java",

                        "import android.annotation.RequiresPermission;",

                        "import android.annotation.SuppressLint;",

                        "import android.content.Context;",

                        "class Foo extends Context {",

                        "  private static final String RED = \"red\";",

                        "  public void checkPermission() {",

                        "  }",

                        "  @RequiresPermission(RED)",

                        "  // BUG: Diagnostic contains:",

                        "  public void exampleScoped(Context context) {",

                        "    checkPermission();",

                        "  }",

                        "}")

                .doTest();

    }

}
 
}