From b9d9e6299ed342a04e48637edb580bfc9b37ed08 Mon Sep 17 00:00:00 2001 From: Daniel Norman Date: Thu, 19 Jan 2023 16:23:32 -0800 Subject: [PATCH] Fix A11yManagerServiceTest by passing in the test handler. Bug: 266114638 Test: Use go/abtd to run AccessibilityManagerServiceTest Change-Id: I0db214863a0e210a19ada0072b9f0ef48659f4bc --- .../server/accessibility/AccessibilityManagerService.java | 7 ++++--- .../accessibility/AccessibilityManagerServiceTest.java | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index b28ab7a0081c0..a57b8f3d0605c 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -253,7 +253,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private final MagnificationController mMagnificationController; private final MagnificationProcessor mMagnificationProcessor; - private final MainHandler mMainHandler; + private final Handler mMainHandler; // Lazily initialized - access through getSystemActionPerformer() private SystemActionPerformer mSystemActionPerformer; @@ -407,6 +407,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub @VisibleForTesting AccessibilityManagerService( Context context, + Handler handler, PackageManager packageManager, AccessibilitySecurityPolicy securityPolicy, SystemActionPerformer systemActionPerformer, @@ -420,7 +421,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub mWindowManagerService = LocalServices.getService(WindowManagerInternal.class); mTraceManager = AccessibilityTraceManager.getInstance( mWindowManagerService.getAccessibilityController(), this, mLock); - mMainHandler = new MainHandler(mContext.getMainLooper()); + mMainHandler = handler; mActivityTaskManagerService = LocalServices.getService(ActivityTaskManagerInternal.class); mPackageManager = packageManager; mSecurityPolicy = securityPolicy; @@ -4027,7 +4028,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub private final ArrayList mDisplaysList = new ArrayList<>(); private int mSystemUiUid = 0; - AccessibilityDisplayListener(Context context, MainHandler handler) { + AccessibilityDisplayListener(Context context, Handler handler) { mDisplayManager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE); mDisplayManager.registerDisplayListener(this, handler); initializeDisplayList(); 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 448ffe538d008..77831dda9d9c9 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java @@ -182,6 +182,7 @@ public class AccessibilityManagerServiceTest { mA11yms = new AccessibilityManagerService( mTestableContext, + mHandler, mMockPackageManager, mMockSecurityPolicy, mMockSystemActionPerformer, @@ -364,6 +365,7 @@ public class AccessibilityManagerServiceTest { ); mA11yms.onMagnificationTransitionEndedLocked(Display.DEFAULT_DISPLAY, true); + mHandler.sendAllMessages(); ArgumentCaptor displayCaptor = ArgumentCaptor.forClass(Display.class); verify(mInputFilter, timeout(100)).refreshMagnificationMode(displayCaptor.capture());