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

Commit ae0bf970 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix an issue that restricted package is not printed if it has no ...... 

Merge "Fix an issue that restricted package is not printed if it has no ... allowed packages." into rvc-dev am: 672950aa am: 05a45c6a am: 4d1deda5

Change-Id: Ia27081bd07a2fdd0dc7c7feaef95da37fcc7ad42
parents ab896111 4d1deda5

services/core/java/com/android/server/am/ActivityManagerService.java

+7 −14
Original line number Diff line number Diff line
@@ -12121,8 +12121,6 @@ public class ActivityManagerService extends IActivityManager.Stub 














    void dumpAllowedAssociationsLocked(FileDescriptor fd, PrintWriter pw, String[] args,















            int opti, boolean dumpAll, String dumpPackage) {













        boolean needSep = false;



























        pw.println("ACTIVITY MANAGER ALLOWED ASSOCIATION STATE (dumpsys activity allowed-associations)");















        boolean printed = false;















        if (mAllowedAssociations != null) {









@@ -12130,21 +12128,16 @@ public class ActivityManagerService extends IActivityManager.Stub













                final String pkg = mAllowedAssociations.keyAt(i);















                final ArraySet<String> asc =















                        mAllowedAssociations.valueAt(i).getAllowedPackageAssociations();













                boolean printedHeader = false;













                for (int j = 0; j < asc.size(); j++) {













                    if (dumpPackage == null || pkg.equals(dumpPackage)













                            || asc.valueAt(j).equals(dumpPackage)) {















                if (!printed) {















                    pw.println("  Allowed associations (by restricted package):");















                    printed = true;













                            needSep = true;















                }













                        if (!printedHeader) {















                pw.print("  * ");















                pw.print(pkg);















                pw.println(":");













                            printedHeader = true;













                        }













                for (int j = 0; j < asc.size(); j++) {













                    if (dumpPackage == null || pkg.equals(dumpPackage)













                            || asc.valueAt(j).equals(dumpPackage)) {















                        pw.print("      Allow: ");















                        pw.println(asc.valueAt(j));















                    }