Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c22722e2 authored by Chun-Ku Lin's avatar Chun-Ku Lin Committed by Android (Google) Code Review
Browse files

Merge "Fix AccessibilityManagerServiceTest exceeded the number of permissible... 

Merge "Fix AccessibilityManagerServiceTest exceeded the number of permissible registered listeners" into main
parents 2a2d0108 46b6b8a1

services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -542,7 +542,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            MagnificationController magnificationController,

            MagnificationController magnificationController,

            @Nullable AccessibilityInputFilter inputFilter,

            @Nullable AccessibilityInputFilter inputFilter,

            ProxyManager proxyManager,

            ProxyManager proxyManager,

            PermissionEnforcer permissionEnforcer) {

            PermissionEnforcer permissionEnforcer,

            HearingDevicePhoneCallNotificationController hearingDeviceNotificationController) {

        super(permissionEnforcer);

        super(permissionEnforcer);

        mContext = context;

        mContext = context;

        mPowerManager =  (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);

        mPowerManager =  (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
@@ -571,8 +572,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
        mVisibleBgUserIds = null;

        mVisibleBgUserIds = null;

        mInputManager = context.getSystemService(InputManager.class);

        mInputManager = context.getSystemService(InputManager.class);

        if (com.android.settingslib.flags.Flags.hearingDevicesInputRoutingControl()) {

        if (com.android.settingslib.flags.Flags.hearingDevicesInputRoutingControl()) {

            mHearingDeviceNotificationController = new HearingDevicePhoneCallNotificationController(

            mHearingDeviceNotificationController = hearingDeviceNotificationController;

                    context);

        } else {

        } else {

            mHearingDeviceNotificationController = null;

            mHearingDeviceNotificationController = null;

        }

        }

services/tests/servicestests/src/com/android/server/accessibility/AccessibilityManagerServiceTest.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -220,6 +220,9 @@ public class AccessibilityManagerServiceTest { 
    @Mock private ProxyManager mProxyManager;

    @Mock private ProxyManager mProxyManager;

    @Mock private StatusBarManagerInternal mStatusBarManagerInternal;

    @Mock private StatusBarManagerInternal mStatusBarManagerInternal;

    @Mock private DevicePolicyManager mDevicePolicyManager;

    @Mock private DevicePolicyManager mDevicePolicyManager;

    @Mock

    private HearingDevicePhoneCallNotificationController

            mMockHearingDevicePhoneCallNotificationController;

    @Spy private IUserInitializationCompleteCallback mUserInitializationCompleteCallback;

    @Spy private IUserInitializationCompleteCallback mUserInitializationCompleteCallback;

    @Captor private ArgumentCaptor<Intent> mIntentArgumentCaptor;

    @Captor private ArgumentCaptor<Intent> mIntentArgumentCaptor;

    private IAccessibilityManager mA11yManagerServiceOnDevice;

    private IAccessibilityManager mA11yManagerServiceOnDevice;
@@ -289,7 +292,8 @@ public class AccessibilityManagerServiceTest { 
                mMockMagnificationController,

                mMockMagnificationController,

                mInputFilter,

                mInputFilter,

                mProxyManager,

                mProxyManager,

                mFakePermissionEnforcer);

                mFakePermissionEnforcer,

                mMockHearingDevicePhoneCallNotificationController);

        mA11yms.switchUser(mTestableContext.getUserId());

        mA11yms.switchUser(mTestableContext.getUserId());

        mTestableLooper.processAllMessages();

        mTestableLooper.processAllMessages();