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

Commit 91507dd7 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix "already registered" error" am: 0df5bbfe am: c4b00b8f... 

Merge "Merge "Fix "already registered" error" am: 0df5bbfe am: c4b00b8f am: f5bc120a" into sc-v2-dev-plus-aosp
parents 606ae04e 8254cbd0

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -127,7 +127,6 @@ class UiAutomationManager { 
            mUiAutomationServiceOwner = owner;

            mUiAutomationServiceOwner = owner;

            mUiAutomationServiceInfo = accessibilityServiceInfo;

            mUiAutomationServiceInfo = accessibilityServiceInfo;

            mUiAutomationService.mServiceInterface = serviceClient;

            mUiAutomationService.mServiceInterface = serviceClient;

            mUiAutomationService.onAdded();

            try {

            try {

                mUiAutomationService.mServiceInterface.asBinder().linkToDeath(mUiAutomationService,

                mUiAutomationService.mServiceInterface.asBinder().linkToDeath(mUiAutomationService,

                        0);

                        0);
@@ -137,6 +136,8 @@ class UiAutomationManager { 
                return;

                return;

            }

            }





            mUiAutomationService.onAdded();



            mUiAutomationService.connectServiceUnknownThread();

            mUiAutomationService.connectServiceUnknownThread();

        }

        }

    }

    }