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

Merge "Fixes 2 race conditions in MetricsLoggerService" into nyc-dev

Browse Source
This commit is contained in:
Hugo Benichi
2016-04-27 23:50:45 +00:00
committed by Android (Google) Code Review
parent 32c1169ab3 9b907e440c
commit 9710859b51
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/connectivity/MetricsLoggerService.java
View File

@@ -192,11 +192,13 @@ public class MetricsLoggerService extends SystemService {
} }
} }
if (!mPendingIntents.isEmpty()) { synchronized (mPendingIntents) {
pw.println(); if (!mPendingIntents.isEmpty()) {
pw.println("Pending intents:"); pw.println();
for (PendingIntent pi : mPendingIntents) { pw.println("Pending intents:");
pw.println(pi.toString()); for (PendingIntent pi : mPendingIntents) {
pw.println(pi.toString());
}
} }
} }
@@ -327,9 +329,9 @@ public class MetricsLoggerService extends SystemService {
result[i++] = e; result[i++] = e;
} }
} }
}
reference.setValue(mLastEventReference); reference.setValue(mLastEventReference);
}
return result; return result;
} }