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

Commit f87a37b9 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Merge "Use separate variables as indices in nested loops" into qt-dev... 

Merge "Merge "Use separate variables as indices in nested loops" into qt-dev am: 2c163664 am: 08b1997c" into qt-r1-dev-plus-aosp
am: 225b5221

Change-Id: Id1db0e328957e87a34fad2653b202376b3b6860e
parents 337d8d2e 225b5221

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

+8 −7
Original line number Original line Diff line number Diff line
@@ -3809,8 +3809,9 @@ public class AppOpsService extends IAppOpsService.Stub { 
            if (mActiveWatchers.size() > 0 && dumpMode < 0) {

            if (mActiveWatchers.size() > 0 && dumpMode < 0) {

                needSep = true;

                needSep = true;

                boolean printedHeader = false;

                boolean printedHeader = false;

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

                for (int watcherNum = 0; watcherNum < mActiveWatchers.size(); watcherNum++) {

                    final SparseArray<ActiveCallback> activeWatchers = mActiveWatchers.valueAt(i);

                    final SparseArray<ActiveCallback> activeWatchers =

                            mActiveWatchers.valueAt(watcherNum);

                    if (activeWatchers.size() <= 0) {

                    if (activeWatchers.size() <= 0) {

                        continue;

                        continue;

                    }

                    }
@@ -3828,16 +3829,16 @@ public class AppOpsService extends IAppOpsService.Stub { 
                    }

                    }

                    pw.print("    ");

                    pw.print("    ");

                    pw.print(Integer.toHexString(System.identityHashCode(

                    pw.print(Integer.toHexString(System.identityHashCode(

                            mActiveWatchers.keyAt(i))));

                            mActiveWatchers.keyAt(watcherNum))));

                    pw.println(" ->");

                    pw.println(" ->");

                    pw.print("        [");

                    pw.print("        [");

                    final int opCount = activeWatchers.size();

                    final int opCount = activeWatchers.size();

                    for (i = 0; i < opCount; i++) {

                    for (int opNum = 0; opNum < opCount; opNum++) {

                        if (i > 0) {

                        if (opNum > 0) {

                            pw.print(' ');

                            pw.print(' ');

                        }

                        }

                        pw.print(AppOpsManager.opToName(activeWatchers.keyAt(i)));

                        pw.print(AppOpsManager.opToName(activeWatchers.keyAt(opNum)));

                        if (i < opCount - 1) {

                        if (opNum < opCount - 1) {

                            pw.print(',');

                            pw.print(',');

                        }

                        }

                    }

                    }