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 
am: 9710859

* commit '9710859b5102f36499a628f2931bafd0a6803437':
  Fixes 2 race conditions in MetricsLoggerService

Change-Id: Ic5dcdfe471c9ee37de2a750b70ee0b78fd2bf5da
This commit is contained in:
Hugo Benichi
2016-04-27 23:58:46 +00:00
committed by android-build-merger
parent 4747b86de1 9710859b51
commit a5dc52f4bd
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()) {
pw.println();
pw.println("Pending intents:");
for (PendingIntent pi : mPendingIntents) {
pw.println(pi.toString());
synchronized (mPendingIntents) {
if (!mPendingIntents.isEmpty()) {
pw.println();
pw.println("Pending intents:");
for (PendingIntent pi : mPendingIntents) {
pw.println(pi.toString());
}
}
}
@@ -327,9 +329,9 @@ public class MetricsLoggerService extends SystemService {
result[i++] = e;
}
}
}
reference.setValue(mLastEventReference);
reference.setValue(mLastEventReference);
}
return result;
}