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

Use separate variables as indices in nested loops

Browse Source 
Otherwise the loop might be stuck forever if
- mActiveWatchers.size() > mActiveWatchers.get(0).size()

Test: adb shell dumpsys appops
Fixes: 133230634
Change-Id: I324b1750cf1e45a543e7a498407fbeadc98aba1b
This commit is contained in:
Philip P. Moltmann
2019-05-21 10:20:38 -07:00
parent 52819a13d3
commit ba13646d7d
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) {
needSep = true;
boolean printedHeader = false;
for (int i = 0; i < mActiveWatchers.size(); i++) {
final SparseArray<ActiveCallback> activeWatchers = mActiveWatchers.valueAt(i);
for (int watcherNum = 0; watcherNum < mActiveWatchers.size(); watcherNum++) {
final SparseArray<ActiveCallback> activeWatchers =
mActiveWatchers.valueAt(watcherNum);
if (activeWatchers.size() <= 0) {
continue;
}
@@ -3833,16 +3834,16 @@ public class AppOpsService extends IAppOpsService.Stub {
}
pw.print(" ");
pw.print(Integer.toHexString(System.identityHashCode(
mActiveWatchers.keyAt(i))));
mActiveWatchers.keyAt(watcherNum))));
pw.println(" ->");
pw.print(" [");
final int opCount = activeWatchers.size();
for (i = 0; i < opCount; i++) {
if (i > 0) {
for (int opNum = 0; opNum < opCount; opNum++) {
if (opNum > 0) {
pw.print(' ');
}
pw.print(AppOpsManager.opToName(activeWatchers.keyAt(i)));
if (i < opCount - 1) {
pw.print(AppOpsManager.opToName(activeWatchers.keyAt(opNum)));
if (opNum < opCount - 1) {
pw.print(',');
}
}