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

Commit dd64a9b0 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

2593833 AccessibilityManager not properly initialized immediately upon... 

 2593833  AccessibilityManager not properly initialized immediately upon registration in the AccessibilityManagerService

Change-Id: I0226bafc5e9c5b800c54019c9309394f1e5f9e88
parent 6ff9d513

core/java/android/view/accessibility/AccessibilityManager.java

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public final class AccessibilityManager { 
        IBinder iBinder = ServiceManager.getService(Context.ACCESSIBILITY_SERVICE);

        mService = IAccessibilityManager.Stub.asInterface(iBinder);

        try {

            mService.addClient(mClient);

            mIsEnabled = mService.addClient(mClient);

        } catch (RemoteException re) {

            Log.e(LOG_TAG, "AccessibilityManagerService is dead", re);

        }

core/java/android/view/accessibility/IAccessibilityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.content.pm.ServiceInfo; 
 */

interface IAccessibilityManager {



    void addClient(IAccessibilityManagerClient client);

    boolean addClient(IAccessibilityManagerClient client);



    boolean sendAccessibilityEvent(in AccessibilityEvent uiEvent);

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

+3 −7
Original line number Diff line number Diff line
@@ -269,14 +269,10 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            });

    }



    public void addClient(IAccessibilityManagerClient client) {

    public boolean addClient(IAccessibilityManagerClient client) {

        synchronized (mLock) {

            try {

                client.setEnabled(mIsEnabled);

            mClients.add(client);

            } catch (RemoteException re) {

                Slog.w(LOG_TAG, "Dead AccessibilityManagerClient: " + client, re);

            }

            return mIsEnabled;

        }

    }