Merge cherrypicks of [9428111, 9427928, 9427929, 9428294, 9428403, 9428295,... (37a24f52) · Commits · e / os / android_frameworks_base

data/keyboards/Vendor_045e_Product_02dd.kl

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		# Copyright (C) 2019 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.

		#
		# XBox One Controller - Model 1697 - USB
		#

		# Mapping according to https://developer.android.com/training/game-controllers/controller-input.html

		key 304 BUTTON_A
		key 305 BUTTON_B
		key 307 BUTTON_X
		key 308 BUTTON_Y

		key 310 BUTTON_L1
		key 311 BUTTON_R1

		# Triggers.
		axis 0x02 LTRIGGER
		axis 0x05 RTRIGGER

		# Left and right stick.
		# The reported value for flat is 128 out of a range from -32767 to 32768, which is absurd.
		# This confuses applications that rely on the flat value because the joystick actually
		# settles in a flat range of +/- 4096 or so.
		axis 0x00 X flat 4096
		axis 0x01 Y flat 4096
		axis 0x03 Z flat 4096
		axis 0x04 RZ flat 4096

		key 317 BUTTON_THUMBL
		key 318 BUTTON_THUMBR

		# Hat.
		axis 0x10 HAT_X
		axis 0x11 HAT_Y


		# Mapping according to https://www.kernel.org/doc/Documentation/input/gamepad.txt
		# Two overlapping rectangles
		key 314 BUTTON_SELECT
		# Hamburger - 3 parallel lines
		key 315 BUTTON_START

		# Xbox key
		key 316 BUTTON_MODE

data/keyboards/Vendor_045e_Product_02fd.kl

+6 −1

Original line number	Diff line number	Diff line
		@@ -53,5 +53,10 @@ key 158 BUTTON_SELECT
		# Hamburger - 3 parallel lines
		key 315 BUTTON_START

		# Xbox key
		# There are at least two versions of firmware out for this controller.
		# They send different linux keys for the "Xbox" button.
		# Xbox key (original firmware)
		key 172 BUTTON_MODE

		# Xbox key (newer firmware)
		key 316 BUTTON_MODE

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -156,7 +156,7 @@ public class AttentionDetector {

		context.getContentResolver().registerContentObserver(Settings.System.getUriFor(
		Settings.System.ADAPTIVE_SLEEP),
		false, new ContentObserver(new Handler()) {
		false, new ContentObserver(new Handler(context.getMainLooper())) {
		@Override
		public void onChange(boolean selfChange) {
		updateEnabledFromSettings(context);

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -2724,6 +2724,14 @@ public final class PowerManagerService extends SystemService
		return true;
		}
		}

		if (mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_DOZE
		&& mDisplayPowerRequest.dozeScreenState == Display.STATE_ON) {
		// Although we are in DOZE and would normally allow the device to suspend,
		// the doze service has explicitly requested the display to remain in the ON
		// state which means we should hold the display suspend blocker.
		return true;
		}
		if (mScreenBrightnessBoostInProgress) {
		return true;
		}
		@@ -4858,7 +4866,8 @@ public final class PowerManagerService extends SystemService
		}
		}

		private final class LocalService extends PowerManagerInternal {
		@VisibleForTesting
		final class LocalService extends PowerManagerInternal {
		@Override
		public void setScreenBrightnessOverrideFromWindowManager(int screenBrightness) {
		if (screenBrightness < PowerManager.BRIGHTNESS_DEFAULT

services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java

+72 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,10 @@ import static android.os.PowerManagerInternal.WAKEFULNESS_DREAMING;

		import static com.google.common.truth.Truth.assertThat;

		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertTrue;
		import static org.mockito.ArgumentMatchers.any;
		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.ArgumentMatchers.anyInt;
		import static org.mockito.ArgumentMatchers.anyString;
		import static org.mockito.ArgumentMatchers.argThat;
		@@ -59,6 +62,7 @@ import android.os.SystemClock;
		import android.os.SystemProperties;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.view.Display;

		import androidx.test.InstrumentationRegistry;

		@@ -157,6 +161,10 @@ public class PowerManagerServiceTest {
		mResourcesSpy = spy(mContextSpy.getResources());
		when(mContextSpy.getResources()).thenReturn(mResourcesSpy);

		when(mDisplayManagerInternalMock.requestPowerState(any(), anyBoolean())).thenReturn(true);
		}

		private PowerManagerService createService() {
		mService = new PowerManagerService(mContextSpy, new Injector() {
		@Override
		Notifier createNotifier(Looper looper, Context context, IBatteryStats batteryStats,
		@@ -166,7 +174,7 @@ public class PowerManagerServiceTest {

		@Override
		SuspendBlocker createSuspendBlocker(PowerManagerService service, String name) {
		return mock(SuspendBlocker.class);
		return super.createSuspendBlocker(service, name);
		}

		@Override
		@@ -191,6 +199,7 @@ public class PowerManagerServiceTest {
		return mAmbientDisplayConfigurationMock;
		}
		});
		return mService;
		}

		@After
		@@ -262,6 +271,7 @@ public class PowerManagerServiceTest {

		@Test
		public void testUpdatePowerScreenPolicy_UpdateDisplayPowerRequest() {
		createService();
		mService.updatePowerRequestFromBatterySaverPolicy(mDisplayPowerRequest);
		assertThat(mDisplayPowerRequest.lowPowerMode).isEqualTo(BATTERY_SAVER_ENABLED);
		assertThat(mDisplayPowerRequest.screenLowPowerBrightnessFactor)
		@@ -270,6 +280,7 @@ public class PowerManagerServiceTest {

		@Test
		public void testGetLastShutdownReasonInternal() {
		createService();
		SystemProperties.set(TEST_LAST_REBOOT_PROPERTY, "shutdown,thermal");
		int reason = mService.getLastShutdownReasonInternal(TEST_LAST_REBOOT_PROPERTY);
		SystemProperties.set(TEST_LAST_REBOOT_PROPERTY, "");
		@@ -278,6 +289,7 @@ public class PowerManagerServiceTest {

		@Test
		public void testGetDesiredScreenPolicy_WithVR() throws Exception {
		createService();
		// Brighten up the screen
		mService.setWakefulnessLocked(WAKEFULNESS_AWAKE, PowerManager.WAKE_REASON_UNKNOWN, 0);
		assertThat(mService.getDesiredScreenPolicyLocked()).isEqualTo(
		@@ -307,11 +319,13 @@ public class PowerManagerServiceTest {

		@Test
		public void testWakefulnessAwake_InitialValue() throws Exception {
		createService();
		assertThat(mService.getWakefulness()).isEqualTo(WAKEFULNESS_AWAKE);
		}

		@Test
		public void testWakefulnessSleep_NoDozeSleepFlag() throws Exception {
		createService();
		// Start with AWAKE state
		startSystem();
		assertThat(mService.getWakefulness()).isEqualTo(WAKEFULNESS_AWAKE);
		@@ -324,6 +338,7 @@ public class PowerManagerServiceTest {

		@Test
		public void testWakefulnessAwake_AcquireCausesWakeup() throws Exception {
		createService();
		startSystem();
		forceSleep();

		@@ -355,6 +370,7 @@ public class PowerManagerServiceTest {

		@Test
		public void testWakefulnessAwake_IPowerManagerWakeUp() throws Exception {
		createService();
		startSystem();
		forceSleep();
		mService.getBinderServiceInstance().wakeUp(SystemClock.uptimeMillis(),
		@@ -369,6 +385,8 @@ public class PowerManagerServiceTest {
		@Test
		public void testWakefulnessAwake_ShouldWakeUpWhenPluggedIn() throws Exception {
		boolean powerState;

		createService();
		startSystem();
		forceSleep();

		@@ -444,6 +462,7 @@ public class PowerManagerServiceTest {

		@Test
		public void testWakefulnessDoze_goToSleep() throws Exception {
		createService();
		// Start with AWAKE state
		startSystem();
		assertThat(mService.getWakefulness()).isEqualTo(WAKEFULNESS_AWAKE);
		@@ -457,6 +476,7 @@ public class PowerManagerServiceTest {
		@Test
		public void testWasDeviceIdleFor_true() {
		int interval = 1000;
		createService();
		mService.onUserActivity();
		SystemClock.sleep(interval + 1 /* just a little more */);
		assertThat(mService.wasDeviceIdleForInternal(interval)).isTrue();
		@@ -465,12 +485,14 @@ public class PowerManagerServiceTest {
		@Test
		public void testWasDeviceIdleFor_false() {
		int interval = 1000;
		createService();
		mService.onUserActivity();
		assertThat(mService.wasDeviceIdleForInternal(interval)).isFalse();
		}

		@Test
		public void testForceSuspend_putsDeviceToSleep() {
		createService();
		mService.systemReady(null);
		mService.onBootPhase(SystemService.PHASE_BOOT_COMPLETED);

		@@ -497,6 +519,8 @@ public class PowerManagerServiceTest {
		final int flags = PowerManager.PARTIAL_WAKE_LOCK;
		final String pkg = mContextSpy.getOpPackageName();

		createService();

		// Set up the Notification mock to keep track of the wakelocks that are currently
		// active or disabled. We'll use this to verify that wakelocks are disabled when
		// they should be.
		@@ -541,7 +565,54 @@ public class PowerManagerServiceTest {

		@Test
		public void testForceSuspend_forceSuspendFailurePropogated() {
		createService();
		when(mNativeWrapperMock.nativeForceSuspend()).thenReturn(false);
		assertThat(mService.getBinderServiceInstance().forceSuspend()).isFalse();
		}

		@Test
		public void testSetDozeOverrideFromDreamManager_triggersSuspendBlocker() throws Exception {
		final String suspendBlockerName = "PowerManagerService.Display";
		final String tag = "acq_causes_wakeup";
		final String packageName = "pkg.name";
		final IBinder token = new Binder();

		final boolean[] isAcquired = new boolean[1];
		doAnswer(inv -> {
		if (suspendBlockerName.equals(inv.getArguments()[0])) {
		isAcquired[0] = false;
		}
		return null;
		}).when(mNativeWrapperMock).nativeReleaseSuspendBlocker(any());

		doAnswer(inv -> {
		if (suspendBlockerName.equals(inv.getArguments()[0])) {
		isAcquired[0] = true;
		}
		return null;
		}).when(mNativeWrapperMock).nativeAcquireSuspendBlocker(any());

		// Need to create the service after we stub the mocks for this test because some of the
		// mocks are used during the constructor.
		createService();

		// Start with AWAKE state
		startSystem();
		assertThat(mService.getWakefulness()).isEqualTo(WAKEFULNESS_AWAKE);
		assertTrue(isAcquired[0]);

		// Take a nap and verify we no longer hold the blocker
		int flags = PowerManager.DOZE_WAKE_LOCK;
		mService.getBinderServiceInstance().acquireWakeLock(token, flags, tag, packageName,
		null /* workSource /, null / historyTag */);
		mService.getBinderServiceInstance().goToSleep(SystemClock.uptimeMillis(),
		PowerManager.GO_TO_SLEEP_REASON_APPLICATION, 0);
		assertThat(mService.getWakefulness()).isEqualTo(WAKEFULNESS_DOZING);
		assertFalse(isAcquired[0]);

		// Override the display state by DreamManager and verify is reacquires the blocker.
		mService.getLocalServiceInstance()
		.setDozeOverrideFromDreamManager(Display.STATE_ON, PowerManager.BRIGHTNESS_DEFAULT);
		assertTrue(isAcquired[0]);
		}
		}