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

Commit 65f5d4f3 authored by Nate Myren's avatar Nate Myren Committed by Automerger Merge Worker
Browse files

Merge "Null safe package name in AppOps writeState" into sc-dev am: 0abd07b3 

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

Change-Id: I016f141621cc890bb015d6c08688897dd7d47389
parents 0d196dc4 0abd07b3

services/core/java/com/android/server/appop/AppOpsService.java

+5 −3
Original line number Diff line number Diff line
@@ -5099,14 +5099,16 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    String lastPkg = null;

                    for (int i=0; i<allOps.size(); i++) {

                        AppOpsManager.PackageOps pkg = allOps.get(i);

                        if (!pkg.getPackageName().equals(lastPkg)) {

                        if (!Objects.equals(pkg.getPackageName(), lastPkg)) {

                            if (lastPkg != null) {

                                out.endTag(null, "pkg");

                            }

                            lastPkg = pkg.getPackageName();

                            if (lastPkg != null) {

                                out.startTag(null, "pkg");

                                out.attribute(null, "n", lastPkg);

                            }

                        }

                        out.startTag(null, "uid");

                        out.attributeInt(null, "n", pkg.getUid());

                        List<AppOpsManager.OpEntry> ops = pkg.getOps();