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

Merge "Fix null handling of getPackagesForOps"

Browse Source
This commit is contained in:
Jay Sullivan
2022-06-27 21:59:15 +00:00
committed by Android (Google) Code Review
parent a71e4bf9e7 374a7d704c
commit 96973c550b
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/AppOpsManager.java
View File

@@ -7563,10 +7563,15 @@ public class AppOpsManager {
@SystemApi
@RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS)
public @NonNull List<AppOpsManager.PackageOps> getPackagesForOps(@Nullable String[] ops) {
final int opCount = ops.length;
final int[] opCodes = new int[opCount];
for (int i = 0; i < opCount; i++) {
opCodes[i] = sOpStrToOp.get(ops[i]);
final int[] opCodes;
if (ops != null) {
final int opCount = ops.length;
opCodes = new int[opCount];
for (int i = 0; i < opCount; i++) {
opCodes[i] = sOpStrToOp.get(ops[i]);
}
} else {
opCodes = null;
}
final List<AppOpsManager.PackageOps> result = getPackagesForOps(opCodes);
return (result != null) ? result : Collections.emptyList();