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

Commit e6142a3d authored by brycelee's avatar brycelee
Browse files

Use correct suppression calculation for suppressing ambient display 

Currently, the passed in suppression rather than the aggregate is
being used to determine whether AOD should be suppressed. This
changelist changes this to the proper calculated suppression.

Fixes: 422209948
Flag: EXEMPT bugfix
Test: atest GtsDozeDeviceTestCases:com.google.android.doze.gts.SuppressAmbientDisplayTest#suppressAmbientDisplay_falseWhileAnotherTokenActive_afterScreenOff_shouldNotEnterDoze
Change-Id: I3f679c089d7f50e80f8787a7668533f0cc132376
parent dc22418a

services/core/java/com/android/server/power/AmbientDisplaySuppressionController.java

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public class AmbientDisplaySuppressionController { 
        try {

            synchronized (mSuppressionTokens) {

                getStatusBar().suppressAmbientDisplay(

                        (suppressionFlags & PowerManager.FLAG_AMBIENT_SUPPRESSION_AOD)

                        (currentSuppression & PowerManager.FLAG_AMBIENT_SUPPRESSION_AOD)

                                == PowerManager.FLAG_AMBIENT_SUPPRESSION_AOD);

            }

        } catch (RemoteException e) {