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

Commit 6d60df75 authored by Marin Shalamanov's avatar Marin Shalamanov Committed by Automerger Merge Worker
Browse files

Merge "Don't query active mode after setting desired mode specs" into sc-dev am: d2e1f0af 

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

Change-Id: Id6b0ca3880c902aadd07ca696bc4b439dd78d7dc
parents 760aa617 d2e1f0af

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

+0 −8
Original line number Diff line number Diff line
@@ -853,14 +853,6 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
            // Do not lock when calling these SurfaceControl methods because they are sync

            // operations that may block for a while when setting display power mode.

            mSurfaceControlProxy.setDesiredDisplayModeSpecs(displayToken, modeSpecs);



            final int sfActiveModeId = mSurfaceControlProxy

                    .getDynamicDisplayInfo(displayToken).activeDisplayModeId;

            synchronized (getSyncRoot()) {

                if (updateActiveModeLocked(sfActiveModeId)) {

                    updateDeviceInfoLocked();

                }

            }

        }



        @Override