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

Commit d9dede17 authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

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

parents e8af7876 489b25e7

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

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

                    }