Merge "Fixes 2 race conditions in MetricsLoggerService" into nyc-dev (9710859b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/connectivity/MetricsLoggerService.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -192,6 +192,7 @@ public class MetricsLoggerService extends SystemService {
		}
		}

		synchronized (mPendingIntents) {
		if (!mPendingIntents.isEmpty()) {
		pw.println();
		pw.println("Pending intents:");
		@@ -199,6 +200,7 @@ public class MetricsLoggerService extends SystemService {
		pw.println(pi.toString());
		}
		}
		}

		pw.println();
		mDnsListener.dump(pw);
		@@ -327,9 +329,9 @@ public class MetricsLoggerService extends SystemService {
		result[i++] = e;
		}
		}
		}

		reference.setValue(mLastEventReference);
		}

		return result;
		}