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

Merge "Fix crash in RequiresPermissionChecker.java" am: ede4a8a9d4 am: 484c089212 am: 6a088277f4

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

Change-Id: I732e0c7497591d98489bc1d4e1d8ff4bc136ee0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust
2023-02-03 21:30:29 +00:00
committed by Automerger Merge Worker
parent ae729515e8 6a088277f4
commit 32cbca5643
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
errorprone/java/com/google/errorprone/bugpatterns/android/RequiresPermissionChecker.java
View File

@@ -412,11 +412,11 @@ public final class RequiresPermissionChecker extends BugChecker
private static ParsedRequiresPermission parseRequiresPermissionRecursively(
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();
res.allOf.add(String.valueOf(ASTHelpers.constValue(tree.getArguments().get(0))));
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();
res.allOf.add(String.valueOf(ASTHelpers.constValue(tree.getArguments().get(1))));
return res;