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

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

Browse Source 
am: 2c163664ba

Change-Id: I8b71c9596919f3af732eff516c7da1c5dc6a09f0
This commit is contained in:
Philip P. Moltmann
2019-05-21 23:36:26 -07:00
committed by android-build-merger
parent ebc7341f7f 2c163664ba
commit a67a6ec472
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3814,8 +3814,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;
} }
@@ -3833,16 +3834,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(',');
} }
} }