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

Merge "Fix CombinationKeyTests failure" into udc-dev am: be845d9e60

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

Change-Id: I0db79c0d9e281623f83e7f071eceb068d846e42d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Arthur Hung
2023-04-27 15:23:37 +00:00
committed by Automerger Merge Worker
parent 1a999d5ad6 be845d9e60
commit a166b7be2b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/policy/SingleKeyGestureDetector.java
View File

@@ -395,7 +395,7 @@ public final class SingleKeyGestureDetector {
private class KeyHandler extends Handler { private class KeyHandler extends Handler {
KeyHandler() { KeyHandler() {
super(Looper.getMainLooper()); super(Looper.myLooper());
} }
@Override @Override

12
services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java
View File

@@ -202,9 +202,11 @@ class TestPhoneWindowManager {
.canonicalToCurrentPackageNames(any()); .canonicalToCurrentPackageNames(any());
} catch (PackageManager.NameNotFoundException ignored) { } } catch (PackageManager.NameNotFoundException ignored) { }
doReturn(mTelecomManager).when(mContext).getSystemService(eq(Context.TELECOM_SERVICE)); doReturn(false).when(mTelecomManager).isInCall();
doReturn(mNotificationManager).when(mContext) doReturn(false).when(mTelecomManager).isRinging();
.getSystemService(eq(NotificationManager.class)); doReturn(mTelecomManager).when(mPhoneWindowManager).getTelecommService();
doNothing().when(mNotificationManager).silenceNotificationSound();
doReturn(mNotificationManager).when(mPhoneWindowManager).getNotificationService();
doReturn(mVibrator).when(mContext).getSystemService(eq(Context.VIBRATOR_SERVICE)); doReturn(mVibrator).when(mContext).getSystemService(eq(Context.VIBRATOR_SERVICE));
final PowerManager.WakeLock wakeLock = mock(PowerManager.WakeLock.class); final PowerManager.WakeLock wakeLock = mock(PowerManager.WakeLock.class);
@@ -235,6 +237,7 @@ class TestPhoneWindowManager {
doNothing().when(mPhoneWindowManager).screenTurnedOn(anyInt()); doNothing().when(mPhoneWindowManager).screenTurnedOn(anyInt());
doNothing().when(mPhoneWindowManager).startedWakingUp(anyInt(), anyInt()); doNothing().when(mPhoneWindowManager).startedWakingUp(anyInt(), anyInt());
doNothing().when(mPhoneWindowManager).finishedWakingUp(anyInt(), anyInt()); doNothing().when(mPhoneWindowManager).finishedWakingUp(anyInt(), anyInt());
doNothing().when(mPhoneWindowManager).lockNow(any());
mPhoneWindowManager.init(new TestInjector(mContext, mWindowManagerFuncsImpl)); mPhoneWindowManager.init(new TestInjector(mContext, mWindowManagerFuncsImpl));
mPhoneWindowManager.systemReady(); mPhoneWindowManager.systemReady();
@@ -249,6 +252,7 @@ class TestPhoneWindowManager {
void tearDown() { void tearDown() {
mHandlerThread.quitSafely(); mHandlerThread.quitSafely();
LocalServices.removeServiceForTest(InputMethodManagerInternal.class); LocalServices.removeServiceForTest(InputMethodManagerInternal.class);
Mockito.reset(mPhoneWindowManager);
mMockitoSession.finishMocking(); mMockitoSession.finishMocking();
} }
@@ -322,6 +326,7 @@ class TestPhoneWindowManager {
void overrideDisplayState(int state) { void overrideDisplayState(int state) {
doReturn(state).when(mDisplay).getState(); doReturn(state).when(mDisplay).getState();
doReturn(state == STATE_ON).when(mDisplayPolicy).isAwake();
Mockito.reset(mPowerManager); Mockito.reset(mPowerManager);
} }
@@ -388,6 +393,7 @@ class TestPhoneWindowManager {
} }
void assertDreamRequest() { void assertDreamRequest() {
waitForIdle();
verify(mDreamManagerInternal).requestDream(); verify(mDreamManagerInternal).requestDream();
} }