Merge cherrypicks of ['googleplex-android-review.googlesource.com/23652858'] into udc-release. (9ca9b1af) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/DeviceStateController.java

+8 −5

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.annotation.CallbackExecutor;
		import android.annotation.NonNull;
		import android.content.Context;
		import android.util.ArrayMap;
		import android.util.Pair;

		import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		@@ -165,18 +166,20 @@ final class DeviceStateController {

		// Make a copy here because it's possible that the consumer tries to remove a callback
		// while we're still iterating through the list, which would end up in a
		// ConcurrentModificationException.
		final List<Map.Entry<Consumer<DeviceState>, Executor>> entries = new ArrayList<>();
		// ConcurrentModificationException. Note that cannot use a List<Map.Entry> because the
		// entries are tied to the backing map. So, if a client removes a callback while
		// we are notifying clients, we will get a NPE.
		final List<Pair<Consumer<DeviceState>, Executor>> entries = new ArrayList<>();
		synchronized (mWmLock) {
		for (Map.Entry<Consumer<DeviceState>, Executor> entry
		: mDeviceStateCallbacks.entrySet()) {
		entries.add(entry);
		entries.add(new Pair<>(entry.getKey(), entry.getValue()));
		}
		}

		for (int i = 0; i < entries.size(); i++) {
		Map.Entry<Consumer<DeviceState>, Executor> entry = entries.get(i);
		entry.getValue().execute(() -> entry.getKey().accept(mCurrentDeviceState));
		final Pair<Consumer<DeviceState>, Executor> entry = entries.get(i);
		entry.second.execute(() -> entry.first.accept(deviceState));
		}
		}
		}