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

Commit 122b2c32 authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Fixing a couple of issues I have introduces in the last patch. 

1. Fix waiting for the wrong instance.

2. Fix cloning of accessibility node info.

Change-Id: Icabf0d4bc947602a32fddc6642cc787f2bc766e4
parent 8b0af627

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -1394,7 +1394,7 @@ public class AccessibilityNodeInfo implements Parcelable { 
        mContentDescription = other.mContentDescription;

        mActions= other.mActions;

        mBooleanProperties = other.mBooleanProperties;

        mGranularities = other.mGranularities.clone();

        mGranularities = (other.mGranularities) != null ? other.mGranularities.clone() : null;

        final int otherChildIdCount = other.mChildNodeIds.size();

        for (int i = 0; i < otherChildIdCount; i++) {

            mChildNodeIds.put(i, other.mChildNodeIds.valueAt(i));

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

+1 −1
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub 
            synchronized (mGestureLock) {

                Thread worker = new Thread(this, THREAD_NAME);

                worker.start();

                while (mHandler == null) {

                while (mHandlerCaller == null) {

                    try {

                        mGestureLock.wait();

                    } catch (InterruptedException ie) {