Merge "Synchronize on ArrayList object mutations to avoid AIOOBE" into main (a3701d37) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/infra/AbstractRemoteService.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -355,9 +355,10 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
		obtainMessage(AbstractRemoteService::handleFinishRequest, this, finshedRequest));
		}

		private void handleFinishRequest(@NonNull BasePendingRequest<S, I> finshedRequest) {
		mUnfinishedRequests.remove(finshedRequest);

		private void handleFinishRequest(@NonNull BasePendingRequest<S, I> finishedRequest) {
		synchronized (mUnfinishedRequests) {
		mUnfinishedRequests.remove(finishedRequest);
		}
		if (mUnfinishedRequests.isEmpty()) {
		scheduleUnbind();
		}
		@@ -460,7 +461,9 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I
		} else {
		if (mVerbose) Slog.v(mTag, "handlePendingRequest(): " + pendingRequest);

		synchronized (mUnfinishedRequests) {
		mUnfinishedRequests.add(pendingRequest);
		}
		cancelScheduledUnbind();

		pendingRequest.run();