Add proper lock to the dropbox throttling map am: 3862660dea am: f1e411be3f (cfe14d9f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+13 −11

Original line number	Diff line number	Diff line
		@@ -10156,7 +10156,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}

		private volatile ArrayMap<String, long[]> mErrorClusterRecords = new ArrayMap<>();
		private final ArrayMap<String, long[]> mErrorClusterRecords = new ArrayMap<>();

		/**
		* Write a description of an error (crash, WTF, ANR) to the drop box.
		@@ -10189,6 +10189,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		// Rate-limit how often we're willing to do the heavy lifting below to
		// collect and record logs; currently 5 logs per 10 second period per eventType.
		final long now = SystemClock.elapsedRealtime();
		synchronized (mErrorClusterRecords) {
		long[] errRecord = mErrorClusterRecords.get(eventType);
		if (errRecord == null) {
		errRecord = new long[2]; // [0]: startTime, [1]: count
		@@ -10200,6 +10201,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		} else {
		if (errRecord[1]++ >= 5) return;
		}
		}

		final StringBuilder sb = new StringBuilder(1024);
		appendDropBoxProcessHeaders(process, processName, sb);