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

Commit f5bc120a authored by Phil Weaver's avatar Phil Weaver Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751360

Change-Id: Icc6dc6d5157c133097e67aad1837c3861fd02080
parents 0977fd36 c4b00b8f

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -126,7 +126,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);
@@ -136,6 +135,8 @@ class UiAutomationManager { 
                return;

                return;

            }

            }





            mUiAutomationService.onAdded();



            mUiAutomationService.connectServiceUnknownThread();

            mUiAutomationService.connectServiceUnknownThread();

        }

        }

    }

    }