commit 366cb69a55b69eb36a94c4b76c092d63681ae827
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 14 16:29:35 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 14 16:29:35 2022 +0000
tree 9a731885ad8f733a69c3b9ae2d8ea49ca488279f
parent d6b0312115f691342278bbfec5b3841fba1a4006
parent 09055e3d4d0626e4a2fe9222b3421fb9513bf4bb

Merge "Fixes a NPE in the DisplayResolutionTracker."

core/java/com/android/internal/jank/DisplayResolutionTracker.java

diff --git a/core/java/com/android/internal/jank/DisplayResolutionTracker.java b/core/java/com/android/internal/jank/DisplayResolutionTracker.java
index fd58468..72a1bac 100644
--- a/core/java/com/android/internal/jank/DisplayResolutionTracker.java
+++ b/core/java/com/android/internal/jank/DisplayResolutionTracker.java
@@ -96,6 +96,9 @@
 
     private void updateDisplay(int displayId) {
         DisplayInfo info = mManager.getDisplayInfo(displayId);
+        if (info == null) {
+            return;
+        }
         @Resolution int resolution = getResolution(info);
 
         synchronized (mLock) {