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

Merge "Null safe package name in AppOps writeState" into sc-dev

Browse Source
This commit is contained in:
Nate Myren
2021-07-16 16:41:28 +00:00
committed by Android (Google) Code Review
parent 0669fb0bfa 0b925d4f46
commit 0abd07b3fb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/appop/AppOpsService.java
View File

@@ -5099,13 +5099,15 @@ public class AppOpsService extends IAppOpsService.Stub {
String lastPkg = null; String lastPkg = null;
for (int i=0; i<allOps.size(); i++) { for (int i=0; i<allOps.size(); i++) {
AppOpsManager.PackageOps pkg = allOps.get(i); AppOpsManager.PackageOps pkg = allOps.get(i);
if (!pkg.getPackageName().equals(lastPkg)) { if (!Objects.equals(pkg.getPackageName(), lastPkg)) {
if (lastPkg != null) { if (lastPkg != null) {
out.endTag(null, "pkg"); out.endTag(null, "pkg");
} }
lastPkg = pkg.getPackageName(); lastPkg = pkg.getPackageName();
out.startTag(null, "pkg"); if (lastPkg != null) {
out.attribute(null, "n", lastPkg); out.startTag(null, "pkg");
out.attribute(null, "n", lastPkg);
}
} }
out.startTag(null, "uid"); out.startTag(null, "uid");
out.attributeInt(null, "n", pkg.getUid()); out.attributeInt(null, "n", pkg.getUid());