Fix NPE in findFrameMetricsObserver
Fixes: 120536278
Test: none
Change-Id: Ie32b10c5ab7e94367f8a21892dfe6d2be4d81d19
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 5929c1b..921294a 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -7054,10 +7054,12 @@
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;
+ }
}
}