Skip to content

Commit 122b2c3

Browse files
committed
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
1 parent 8b0af62 commit 122b2c3

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1394,7 +1394,7 @@ private void init(AccessibilityNodeInfo other) {
13941394
mContentDescription = other.mContentDescription;
13951395
mActions= other.mActions;
13961396
mBooleanProperties = other.mBooleanProperties;
1397-
mGranularities = other.mGranularities.clone();
1397+
mGranularities = (other.mGranularities) != null ? other.mGranularities.clone() : null;
13981398
final int otherChildIdCount = other.mChildNodeIds.size();
13991399
for (int i = 0; i < otherChildIdCount; i++) {
14001400
mChildNodeIds.put(i, other.mChildNodeIds.valueAt(i));

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,7 @@ public GestureHandler() {
10081008
synchronized (mGestureLock) {
10091009
Thread worker = new Thread(this, THREAD_NAME);
10101010
worker.start();
1011-
while (mHandler == null) {
1011+
while (mHandlerCaller == null) {
10121012
try {
10131013
mGestureLock.wait();
10141014
} catch (InterruptedException ie) {

0 commit comments

Comments
 (0)