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

Commit 678ca03f authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when passing displayId through handler" into sc-v2-dev am: d9dede17 am: 0b80eb78 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15795828

Change-Id: I934348cc7567d29297628a245d23a22cace28bb7
parents 3173adc9 0b80eb78

services/core/java/com/android/server/display/DisplayManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -2312,6 +2312,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();

                    }