Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in findFrameMetricsObserver" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-02 00:59:30 +00:00
committed by Android (Google) Code Review
parent 6a0faa6592 140ff5ea8e
commit 1d40ffcabf
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/View.java
View File

@@ -7054,10 +7054,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
private FrameMetricsObserver findFrameMetricsObserver(
Window.OnFrameMetricsAvailableListener listener) {
for (int i = 0; i < mFrameMetricsObservers.size(); i++) {
FrameMetricsObserver observer = mFrameMetricsObservers.get(i);
if (observer.mListener == listener) {
return observer;
if (mFrameMetricsObservers != null) {
for (int i = 0; i < mFrameMetricsObservers.size(); i++) {
FrameMetricsObserver observer = mFrameMetricsObservers.get(i);
if (observer.mListener == listener) {
return observer;
}
}
}