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

2016-04-27 23:50:45 +00:00
parent 32c1169ab3 9b907e440c
commit 9710859b51
1 changed files with 9 additions and 7 deletions
--- a/services/core/java/com/android/server/connectivity/MetricsLoggerService.java
+++ b/services/core/java/com/android/server/connectivity/MetricsLoggerService.java
@@ -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;
        }