Merge "Fix: Mock input manager in A11yServiceTest" into main

1 files changed, 13 insertions, 0 deletions

diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java
index e0bc3e76f31d..457d8a96fea4 100644
--- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java
@@ -87,6 +87,9 @@ import android.content.res.XmlResourceParser;
 import android.graphics.drawable.Icon;
 import android.hardware.display.DisplayManager;
 import android.hardware.display.DisplayManagerGlobal;
+import android.hardware.input.IInputManager;
+import android.hardware.input.InputManager;
+import android.hardware.input.InputManagerGlobal;
 import android.hardware.input.KeyGestureEvent;
 import android.net.Uri;
 import android.os.Build;
@@ -237,6 +240,9 @@ public class AccessibilityManagerServiceTest {
     @Mock
     private HearingDevicePhoneCallNotificationController
             mMockHearingDevicePhoneCallNotificationController;
+    @Mock
+    private IInputManager mMockInputManagerService;
+    private InputManagerGlobal.TestSession mInputManagerTestSession;
     @Spy private IUserInitializationCompleteCallback mUserInitializationCompleteCallback;
     @Captor private ArgumentCaptor<Intent> mIntentArgumentCaptor;
     private IAccessibilityManager mA11yManagerServiceOnDevice;
@@ -270,6 +276,10 @@ public class AccessibilityManagerServiceTest {
         mInputFilter = mock(FakeInputFilter.class);
         mTestableContext.addMockSystemService(DevicePolicyManager.class, mDevicePolicyManager);
 
+        mInputManagerTestSession = InputManagerGlobal.createTestSession(mMockInputManagerService);
+        InputManager mockInputManager = new InputManager(mTestableContext);
+        mTestableContext.addMockSystemService(InputManager.class, mockInputManager);
+
         when(mMockPackageManagerInternal.getSystemUiServiceComponent()).thenReturn(
                 new ComponentName("com.android.systemui", "com.android.systemui.SystemUIService"));
         when(mMockPackageManagerInternal.getPackageUid(eq("com.android.systemui"), anyLong(),
@@ -334,6 +344,9 @@ public class AccessibilityManagerServiceTest {
         FieldSetter.setField(
                 am, AccessibilityManager.class.getDeclaredField("mService"),
                 mA11yManagerServiceOnDevice);
+        if (mInputManagerTestSession != null) {
+            mInputManagerTestSession.close();
+        }
     }
 
     private void setupAccessibilityServiceConnection(int serviceInfoFlag) {