diff options
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityNodeInfo.java | 2 | ||||
| -rw-r--r-- | services/java/com/android/server/accessibility/AccessibilityManagerService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 7e565fca22aa..cdb9e77bf6e0 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -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)); diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java index 648e4d53654c..e980ccc9bbba 100644 --- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -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) { |