Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Doze-Pulsing should always go to display on am: a1d372c4ce

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

Change-Id: Id8aea0f2fd7dfcafbd40ec7d00144209198f32e0
This commit is contained in:
Beverly
2022-02-16 19:32:46 +00:00
committed by Automerger Merge Worker
parent 25dcf5e025 a1d372c4ce
commit 114d05e024
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java
View File

@@ -118,9 +118,11 @@ public class DozeMachine {
switch (this) {
case UNINITIALIZED:
case INITIALIZED:
case DOZE_REQUEST_PULSE:
return parameters.shouldControlScreenOff() ? Display.STATE_ON
: Display.STATE_OFF;
case DOZE_REQUEST_PULSE:
return parameters.getDisplayNeedsBlanking() ? Display.STATE_OFF
: Display.STATE_ON;
case DOZE_AOD_PAUSED:
case DOZE:
return Display.STATE_OFF;

18
packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
View File

@@ -42,12 +42,14 @@ import static org.mockito.Mockito.when;
import android.hardware.display.AmbientDisplayConfiguration;
import android.testing.AndroidTestingRunner;
import android.testing.UiThreadTest;
import android.view.Display;
import androidx.test.filters.SmallTest;
import com.android.systemui.SysuiTestCase;
import com.android.systemui.dock.DockManager;
import com.android.systemui.keyguard.WakefulnessLifecycle;
import com.android.systemui.statusbar.phone.DozeParameters;
import com.android.systemui.statusbar.policy.BatteryController;
import com.android.systemui.util.wakelock.WakeLockFake;
@@ -444,4 +446,20 @@ public class DozeMachineTest extends SysuiTestCase {
assertTrue(mServiceFake.requestedWakeup);
}
@Test
public void testDozePulsing_displayRequiresBlanking_screenState() {
DozeParameters dozeParameters = mock(DozeParameters.class);
when(dozeParameters.getDisplayNeedsBlanking()).thenReturn(true);
assertEquals(Display.STATE_OFF, DOZE_REQUEST_PULSE.screenState(dozeParameters));
}
@Test
public void testDozePulsing_displayDoesNotRequireBlanking_screenState() {
DozeParameters dozeParameters = mock(DozeParameters.class);
when(dozeParameters.getDisplayNeedsBlanking()).thenReturn(false);
assertEquals(Display.STATE_ON, DOZE_REQUEST_PULSE.screenState(dozeParameters));
}
}