Merge "New vote for low light blocking zone" into main (6c63f33a) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/feature/DisplayManagerFlags.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,10 @@ public class DisplayManagerFlags {
		Flags.FLAG_ENABLE_VSYNC_LOW_POWER_VOTE,
		Flags::enableVsyncLowPowerVote);

		private final FlagState mVsyncLowLightVote = new FlagState(
		Flags.FLAG_ENABLE_VSYNC_LOW_LIGHT_VOTE,
		Flags::enableVsyncLowLightVote);

		private final FlagState mBrightnessWearBedtimeModeClamperFlagState = new FlagState(
		Flags.FLAG_BRIGHTNESS_WEAR_BEDTIME_MODE_CLAMPER,
		Flags::brightnessWearBedtimeModeClamper);
		@@ -220,6 +224,10 @@ public class DisplayManagerFlags {
		return mVsyncLowPowerVote.isEnabled();
		}

		public boolean isVsyncLowLightVoteEnabled() {
		return mVsyncLowLightVote.isEnabled();
		}

		public boolean isBrightnessWearBedtimeModeClamperEnabled() {
		return mBrightnessWearBedtimeModeClamperFlagState.isEnabled();
		}

services/core/java/com/android/server/display/feature/display_flags.aconfig

+8 −0

Original line number	Diff line number	Diff line
		@@ -145,6 +145,14 @@ flag {
		is_fixed_read_only: true
		}

		flag {
		name: "enable_vsync_low_light_vote"
		namespace: "display_manager"
		description: "Feature flag for vsync low light vote"
		bug: "314921657"
		is_fixed_read_only: true
		}

		flag {
		name: "brightness_wear_bedtime_mode_clamper"
		namespace: "display_manager"

services/core/java/com/android/server/display/mode/DisplayModeDirector.java

+18 −3

Original line number	Diff line number	Diff line
		@@ -215,7 +215,8 @@ public class DisplayModeDirector {
		mDeviceConfigDisplaySettings = new DeviceConfigDisplaySettings();
		mSettingsObserver = new SettingsObserver(context, handler, mDvrrSupported,
		displayManagerFlags);
		mBrightnessObserver = new BrightnessObserver(context, handler, injector);
		mBrightnessObserver = new BrightnessObserver(context, handler, injector, mDvrrSupported,
		displayManagerFlags);
		mDefaultDisplayDeviceConfig = null;
		mUdfpsObserver = new UdfpsObserver();
		mVotesStorage = new VotesStorage(this::notifyDesiredDisplayModeSpecsChangedLocked,
		@@ -1510,6 +1511,8 @@ public class DisplayModeDirector {
		private final Injector mInjector;
		private final Handler mHandler;

		private final boolean mVsyncLowLightBlockingVoteEnabled;

		private final IThermalEventListener.Stub mThermalListener =
		new IThermalEventListener.Stub() {
		@Override
		@@ -1544,7 +1547,8 @@ public class DisplayModeDirector {
		@GuardedBy("mLock")
		private @Temperature.ThrottlingStatus int mThermalStatus = Temperature.THROTTLING_NONE;

		BrightnessObserver(Context context, Handler handler, Injector injector) {
		BrightnessObserver(Context context, Handler handler, Injector injector,
		boolean dvrrSupported , DisplayManagerFlags flags) {
		mContext = context;
		mHandler = handler;
		mInjector = injector;
		@@ -1552,6 +1556,7 @@ public class DisplayModeDirector {
		/* attemptReadFromFeatureParams= */ false);
		mRefreshRateInHighZone = context.getResources().getInteger(
		R.integer.config_fixedRefreshRateInHighZone);
		mVsyncLowLightBlockingVoteEnabled = dvrrSupported && flags.isVsyncLowLightVoteEnabled();
		}

		/**
		@@ -2131,8 +2136,18 @@ public class DisplayModeDirector {
		Vote.forPhysicalRefreshRates(range.min, range.max);
		}
		}

		if (mVsyncLowLightBlockingVoteEnabled) {
		refreshRateSwitchingVote = Vote.forSupportedModesAndDisableRefreshRateSwitching(
		List.of(
		new SupportedModesVote.SupportedMode(
		/* peakRefreshRate= / 60f, / vsyncRate= */ 60f),
		new SupportedModesVote.SupportedMode(
		/* peakRefreshRate= /120f, / vsyncRate= */ 120f)));
		} else {
		refreshRateSwitchingVote = Vote.forDisableRefreshRateSwitching();
		}
		}

		boolean insideHighZone = hasValidHighZone()
		&& isInsideHighZone(mBrightness, mAmbientLux);

services/core/java/com/android/server/display/mode/Vote.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -170,6 +170,13 @@ interface Vote {
		return new SupportedModesVote(supportedModes);
		}


		static Vote forSupportedModesAndDisableRefreshRateSwitching(
		List<SupportedModesVote.SupportedMode> supportedModes) {
		return new CombinedVote(
		List.of(forDisableRefreshRateSwitching(), forSupportedModes(supportedModes)));
		}

		static String priorityToString(int priority) {
		switch (priority) {
		case PRIORITY_APP_REQUEST_BASE_MODE_REFRESH_RATE:

services/tests/displayservicetests/src/com/android/server/display/mode/BrightnessObserverTest.kt

0 → 100644

+104 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.server.display.mode

		import android.content.Context
		import android.content.ContextWrapper
		import android.hardware.display.BrightnessInfo
		import android.view.Display
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.filters.SmallTest
		import com.android.server.display.DisplayDeviceConfig
		import com.android.server.display.feature.DisplayManagerFlags
		import com.android.server.testutils.TestHandler
		import com.google.common.truth.Truth.assertThat
		import com.google.testing.junit.testparameterinjector.TestParameter
		import com.google.testing.junit.testparameterinjector.TestParameterInjector
		import org.junit.Before
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mockito
		import org.mockito.junit.MockitoJUnit
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.whenever

		@SmallTest
		@RunWith(TestParameterInjector::class)
		class BrightnessObserverTest {

		@get:Rule
		val mockitoRule = MockitoJUnit.rule()

		private lateinit var spyContext: Context
		private val mockInjector = mock<DisplayModeDirector.Injector>()
		private val mockFlags = mock<DisplayManagerFlags>()
		private val mockDeviceConfig = mock<DisplayDeviceConfig>()

		private val testHandler = TestHandler(null)

		@Before
		fun setUp() {
		spyContext = Mockito.spy(ContextWrapper(ApplicationProvider.getApplicationContext()))
		}

		@Test
		fun testLowLightBlockingZoneVotes(@TestParameter testCase: LowLightTestCase) {
		setUpLowBrightnessZone()
		whenever(mockFlags.isVsyncLowLightVoteEnabled).thenReturn(testCase.vsyncLowLightVoteEnabled)
		val displayModeDirector = DisplayModeDirector(
		spyContext, testHandler, mockInjector, mockFlags)
		val brightnessObserver = displayModeDirector.BrightnessObserver(
		spyContext, testHandler, mockInjector, testCase.vrrSupported, mockFlags)

		brightnessObserver.onRefreshRateSettingChangedLocked(0.0f, 120.0f)
		brightnessObserver.updateBlockingZoneThresholds(mockDeviceConfig, false)
		brightnessObserver.onDeviceConfigRefreshRateInLowZoneChanged(60)

		brightnessObserver.onDisplayChanged(Display.DEFAULT_DISPLAY)

		assertThat(displayModeDirector.getVote(VotesStorage.GLOBAL_ID,
		Vote.PRIORITY_FLICKER_REFRESH_RATE_SWITCH)).isEqualTo(testCase.expectedVote)
		}

		private fun setUpLowBrightnessZone() {
		whenever(mockInjector.getBrightnessInfo(Display.DEFAULT_DISPLAY)).thenReturn(
		BrightnessInfo(/* brightness = / 0.05f, / adjustedBrightness = */ 0.05f,
		/* brightnessMinimum = / 0.0f, / brightnessMaximum = */ 1.0f,
		BrightnessInfo.HIGH_BRIGHTNESS_MODE_OFF,
		/* highBrightnessTransitionPoint = */ 1.0f,
		BrightnessInfo.BRIGHTNESS_MAX_REASON_NONE))
		whenever(mockDeviceConfig.highDisplayBrightnessThresholds).thenReturn(floatArrayOf())
		whenever(mockDeviceConfig.highAmbientBrightnessThresholds).thenReturn(floatArrayOf())
		whenever(mockDeviceConfig.lowDisplayBrightnessThresholds).thenReturn(floatArrayOf(0.1f))
		whenever(mockDeviceConfig.lowAmbientBrightnessThresholds).thenReturn(floatArrayOf(10f))
		}

		enum class LowLightTestCase(
		val vrrSupported: Boolean,
		val vsyncLowLightVoteEnabled: Boolean,
		internal val expectedVote: Vote
		) {
		ALL_ENABLED(true, true, CombinedVote(
		listOf(DisableRefreshRateSwitchingVote(true),
		SupportedModesVote(
		listOf(SupportedModesVote.SupportedMode(60f, 60f),
		SupportedModesVote.SupportedMode(120f, 120f)))))),
		VRR_NOT_SUPPORTED(false, true, DisableRefreshRateSwitchingVote(true)),
		VSYNC_VOTE_DISABLED(true, false, DisableRefreshRateSwitchingVote(true))
		}
		}
		No newline at end of file