Merge "Prevent outofbounds exception when logging." into main (8328d0f1) · Commits · e / os / android_frameworks_base

core/java/android/hardware/display/DisplayManagerGlobal.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -463,8 +463,8 @@ public final class DisplayManagerGlobal {
		mDisplayListeners.get(index).setEventsMask(internalEventFlagsMask);
		}
		updateCallbackIfNeededLocked();
		maybeLogAllDisplayListeners();
		}
		maybeLogAllDisplayListeners();
		}


		@@ -511,8 +511,10 @@ public final class DisplayManagerGlobal {
		}

		Slog.i(TAG, "Currently Registered Display Listeners:");
		for (int i = 0; i < mDisplayListeners.size(); i++) {
		Slog.i(TAG, i + ": " + mDisplayListeners.get(i));
		int i = 0;
		for (DisplayListenerDelegate d : mDisplayListeners) {
		Slog.i(TAG, i + ": " + d);
		i++;
		}
		}

		@@ -1453,8 +1455,8 @@ public final class DisplayManagerGlobal {
		registerCallbackIfNeededLocked();
		updateCallbackIfNeededLocked();
		}
		maybeLogAllTopologyListeners();
		}
		maybeLogAllTopologyListeners();
		}

		/**