Merge "Fix ArrayIndexOfBoundsException in WallpaperManagerService" into main (d992b333) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -1073,18 +1073,22 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		}

		void forEachDisplayConnector(Consumer<DisplayConnector> action) {
		synchronized (mLock) {
		for (int i = mDisplayConnector.size() - 1; i >= 0; i--) {
		final DisplayConnector connector = mDisplayConnector.valueAt(i);
		action.accept(connector);
		}
		}
		}

		int getConnectedEngineSize() {
		int engineSize = 0;
		synchronized (mLock) {
		for (int i = mDisplayConnector.size() - 1; i >= 0; i--) {
		final DisplayConnector connector = mDisplayConnector.valueAt(i);
		if (connector.mEngine != null) engineSize++;
		}
		}
		return engineSize;
		}