Merge "Fix NPE when passing displayId through handler" into sc-v2-dev

2021-09-14 13:30:51 +00:00
parent e8af787674 489b25e7e9
commit d9dede17af
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -2252,6 +2252,9 @@ public final class DisplayManagerService extends SystemService {
                        int displayId = msg.arg1;
                        final LogicalDisplay display =
                                mLogicalDisplayMapper.getDisplayLocked(displayId);
+                        if (display == null) {
+                            break;
+                        }
                        uids = display.getPendingFrameRateOverrideUids();
                        display.clearPendingFrameRateOverrideUids();
                    }