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

Commit 96973c55 authored by Jay Sullivan's avatar Jay Sullivan Committed by Android (Google) Code Review
Browse files

Merge "Fix null handling of getPackagesForOps"

parents a71e4bf9 374a7d70
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -7563,11 +7563,16 @@ public class AppOpsManager {
    @SystemApi
    @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS)
    public @NonNull List<AppOpsManager.PackageOps> getPackagesForOps(@Nullable String[] ops) {
        final int[] opCodes;
        if (ops != null) {
            final int opCount = ops.length;
        final int[] opCodes = new int[opCount];
            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();
    }