Merge "Merge "Fix NPE in findFrameMetricsObserver" into qt-dev am: 1d40ffcabf"... (699e15c6) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -7178,12 +7178,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,

		private FrameMetricsObserver findFrameMetricsObserver(
		Window.OnFrameMetricsAvailableListener listener) {
		if (mFrameMetricsObservers != null) {
		for (int i = 0; i < mFrameMetricsObservers.size(); i++) {
		FrameMetricsObserver observer = mFrameMetricsObservers.get(i);
		if (observer.mListener == listener) {
		return observer;
		}
		}
		}

		return null;
		}