Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc702bfb authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Fix NPE in findFrameMetricsObserver" into qt-dev 

am: 1d40ffca

Change-Id: Ia13a64a01faa9ab1cc5d7fa914ef306db159a146
parents 0c2d2223 1d40ffca

core/java/android/view/View.java

+6 −4
Original line number Diff line number Diff line
@@ -7054,12 +7054,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;















    }