Merge "Add KB BL user inactivity time to config" into main (6309886a) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -1849,6 +1849,10 @@
		<item>-1</item>
		</integer-array>

		<!-- Specifies the delay in milliseconds after the last user input before turning off the
		keyboard backlight.
		-->
		<integer name="config_keyboardBacklightTimeoutMs">30000</integer>
		<!-- An array describing the screen's backlight values corresponding to the brightness
		values in the config_screenBrightnessNits array.

core/res/res/values/symbols.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -2098,6 +2098,7 @@
		<java-symbol type="integer" name="config_autoBrightnessDarkeningLightDebounce"/>
		<java-symbol type="integer" name="config_autoBrightnessInitialLightSensorRate"/>
		<java-symbol type="integer" name="config_autoBrightnessLightSensorRate"/>
		<java-symbol type="integer" name="config_keyboardBacklightTimeoutMs" />
		<java-symbol type="integer" name="config_carDockKeepsScreenOn" />
		<java-symbol type="integer" name="config_criticalBatteryWarningLevel" />
		<java-symbol type="integer" name="config_datause_notification_type" />

services/core/java/com/android/server/input/KeyboardBacklightController.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import android.animation.ValueAnimator;
		import android.annotation.BinderThread;
		import android.annotation.Nullable;
		import android.content.Context;
		import android.content.res.Resources;
		import android.graphics.Color;
		import android.hardware.input.IKeyboardBacklightListener;
		import android.hardware.input.IKeyboardBacklightState;
		@@ -80,9 +81,6 @@ final class KeyboardBacklightController implements

		private static final String UEVENT_KEYBOARD_BACKLIGHT_TAG = "kbd_backlight";

		@VisibleForTesting
		static final long USER_INACTIVITY_THRESHOLD_MILLIS = Duration.ofSeconds(30).toMillis();

		@VisibleForTesting
		static final int[] DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL =
		new int[DEFAULT_NUM_BRIGHTNESS_CHANGE_STEPS + 1];
		@@ -112,6 +110,7 @@ final class KeyboardBacklightController implements
		private AmbientKeyboardBacklightController.AmbientKeyboardBacklightListener mAmbientListener;

		private int mAmbientBacklightValue = 0;
		private final int mUserInactivityThresholdMs;

		static {
		// Fixed brightness levels to avoid issues when converting back and forth from the
		@@ -139,6 +138,9 @@ final class KeyboardBacklightController implements
		mAnimatorFactory = animatorFactory;
		mAmbientController = new AmbientKeyboardBacklightController(context, looper);
		mUEventManager = uEventManager;
		Resources res = mContext.getResources();
		mUserInactivityThresholdMs = res.getInteger(
		com.android.internal.R.integer.config_keyboardBacklightTimeoutMs);
		}

		@Override
		@@ -300,7 +302,7 @@ final class KeyboardBacklightController implements
		}
		mHandler.removeMessages(MSG_NOTIFY_USER_INACTIVITY);
		mHandler.sendEmptyMessageAtTime(MSG_NOTIFY_USER_INACTIVITY,
		SystemClock.uptimeMillis() + USER_INACTIVITY_THRESHOLD_MILLIS);
		SystemClock.uptimeMillis() + mUserInactivityThresholdMs);
		}

		private void handleUserInactivity() {

tests/Input/src/com/android/server/input/KeyboardBacklightControllerTests.kt

+35 −3

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.server.input
		import android.animation.ValueAnimator
		import android.content.Context
		import android.content.ContextWrapper
		import android.content.res.Resources
		import android.graphics.Color
		import android.hardware.input.IKeyboardBacklightListener
		import android.hardware.input.IKeyboardBacklightState
		@@ -28,11 +29,12 @@ import android.os.UEventObserver
		import android.os.test.TestLooper
		import android.platform.test.annotations.Presubmit
		import android.view.InputDevice
		import android.util.TypedValue
		import androidx.test.annotation.UiThreadTest
		import androidx.test.core.app.ApplicationProvider
		import com.android.internal.R
		import com.android.server.input.KeyboardBacklightController.DEFAULT_BRIGHTNESS_VALUE_FOR_LEVEL
		import com.android.server.input.KeyboardBacklightController.MAX_BRIGHTNESS_CHANGE_STEPS
		import com.android.server.input.KeyboardBacklightController.USER_INACTIVITY_THRESHOLD_MILLIS
		import com.android.test.input.MockInputManagerRule
		import java.io.FileNotFoundException
		import java.io.FileOutputStream
		@@ -49,6 +51,7 @@ import org.junit.Rule
		import org.junit.Test
		import org.mockito.Mock
		import org.mockito.Mockito.any
		import org.mockito.Mockito.anyBoolean
		import org.mockito.Mockito.anyInt
		import org.mockito.Mockito.eq
		import org.mockito.Mockito.spy
		@@ -94,6 +97,7 @@ class KeyboardBacklightControllerTests {
		const val LIGHT_ID = 2
		const val SECOND_LIGHT_ID = 3
		const val MAX_BRIGHTNESS = 255
		const val USER_INACTIVITY_THRESHOLD_MILLIS = 30000
		}

		@get:Rule
		@@ -105,6 +109,8 @@ class KeyboardBacklightControllerTests {
		private lateinit var native: NativeInputManagerService
		@Mock
		private lateinit var uEventManager: UEventManager
		@Mock
		private lateinit var resources: Resources
		private lateinit var keyboardBacklightController: KeyboardBacklightController
		private lateinit var context: Context
		private lateinit var dataStore: PersistentDataStore
		@@ -117,6 +123,7 @@ class KeyboardBacklightControllerTests {
		@Before
		fun setup() {
		context = spy(ContextWrapper(ApplicationProvider.getApplicationContext()))
		`when`(context.resources).thenReturn(resources)
		dataStore = PersistentDataStore(object : PersistentDataStore.Injector() {
		override fun openRead(): InputStream? {
		throw FileNotFoundException()
		@@ -129,6 +136,7 @@ class KeyboardBacklightControllerTests {
		override fun finishWrite(fos: FileOutputStream?, success: Boolean) {}
		})
		testLooper = TestLooper()
		setupConfig()
		keyboardBacklightController = KeyboardBacklightController(context, native, dataStore,
		testLooper.looper, FakeAnimatorFactory(), uEventManager)
		val inputManager = InputManager(context)
		@@ -147,7 +155,31 @@ class KeyboardBacklightControllerTests {
		sysfsNodeChanges++
		}
		}

		private fun setupConfig() {
		val brightnessValues = intArrayOf(100, 200, 0)
		val decreaseThresholds = intArrayOf(-1, 900, 1900)
		val increaseThresholds = intArrayOf(1000, 2000, -1)
		`when`(resources.getIntArray(R.array.config_autoKeyboardBacklightBrightnessValues))
		.thenReturn(brightnessValues)
		`when`(resources.getIntArray(R.array.config_autoKeyboardBacklightDecreaseLuxThreshold))
		.thenReturn(decreaseThresholds)
		`when`(resources.getIntArray(R.array.config_autoKeyboardBacklightIncreaseLuxThreshold))
		.thenReturn(increaseThresholds)
		`when`(resources.getInteger(R.integer.config_keyboardBacklightTimeoutMs))
		.thenReturn(USER_INACTIVITY_THRESHOLD_MILLIS)
		`when`(
		resources.getValue(
		eq(R.dimen.config_autoKeyboardBrightnessSmoothingConstant),
		any(TypedValue::class.java),
		anyBoolean()
		)
		).then {
		val args = it.arguments
		val outValue = args[1] as TypedValue
		outValue.data = java.lang.Float.floatToRawIntBits(1.0f)
		Unit
		}
		}
		@Test
		fun testKeyboardBacklightIncrementDecrement() {
		KeyboardBacklightFlags(
		@@ -365,7 +397,7 @@ class KeyboardBacklightControllerTests {
		lightColorMap[LIGHT_ID]
		)

		testLooper.moveTimeForward(USER_INACTIVITY_THRESHOLD_MILLIS + 1000)
		testLooper.moveTimeForward((USER_INACTIVITY_THRESHOLD_MILLIS + 1000).toLong())
		testLooper.dispatchNext()
		assertEquals(
		"Keyboard backlight level should be turned off after inactivity",