Merge "Fixing bugs discovered by the CTS tests." (f9d73e60) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+11 −5

Original line number	Diff line number	Diff line
		@@ -6435,11 +6435,17 @@ public final class ViewRootImpl implements ViewParent,
		public long mLastEventTimeMillis;

		public void run() {
		// The accessibility may be turned off while we were waiting so check again.
		if (AccessibilityManager.getInstance(mContext).isEnabled()) {
		mLastEventTimeMillis = SystemClock.uptimeMillis();
		AccessibilityEvent event = AccessibilityEvent.obtain();
		event.setEventType(AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED);
		event.setContentChangeType(AccessibilityEvent.CONTENT_CHANGE_TYPE_SUBTREE);
		mSource.sendAccessibilityEventUnchecked(event);
		} else {
		mLastEventTimeMillis = 0;
		}
		// In any case reset to initial state.
		mSource.resetSubtreeAccessibilityStateChanged();
		mSource = null;
		}

core/java/android/view/accessibility/AccessibilityNodeInfoCache.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ public class AccessibilityNodeInfoCache {

		private static final boolean ENABLED = true;

		private static final boolean DEBUG = true;
		private static final boolean DEBUG = false;

		private static final boolean CHECK_INTEGRITY_IF_DEBUGGABLE_BUILD = true;

		@@ -108,7 +108,7 @@ public class AccessibilityNodeInfoCache {

		private void refreshCachedNode(long sourceId) {
		if (DEBUG) {
		Log.i(LOG_TAG, "Refresing cached node.");
		Log.i(LOG_TAG, "Refreshing cached node.");
		}
		synchronized (mLock) {
		AccessibilityNodeInfo cachedInfo = mCacheImpl.get(sourceId);
		@@ -117,7 +117,7 @@ public class AccessibilityNodeInfoCache {
		return;
		}
		// The node changed so we will just refresh it right now.
		if (cachedInfo.refresh(false)) {
		if (cachedInfo.refresh(true)) {
		return;
		}
		// Weird, we could not refresh. Just evict the entire sub-tree.
		@@ -141,7 +141,7 @@ public class AccessibilityNodeInfoCache {
		info = AccessibilityNodeInfo.obtain(info);
		}
		if (DEBUG) {
		// Log.i(LOG_TAG, "get(" + accessibilityNodeId + ") = " + info);
		Log.i(LOG_TAG, "get(" + accessibilityNodeId + ") = " + info);
		}
		return info;
		}
		@@ -159,7 +159,7 @@ public class AccessibilityNodeInfoCache {
		if (ENABLED) {
		synchronized(mLock) {
		if (DEBUG) {
		// Log.i(LOG_TAG, "add(" + info + ")");
		Log.i(LOG_TAG, "add(" + info + ")");
		}

		final long sourceId = info.getSourceNodeId();
		@@ -319,8 +319,6 @@ public class AccessibilityNodeInfoCache {
		Log.e(LOG_TAG, "Node from: " + info.getWindowId() + " not from:"
		+ windowId + " " + info);
		}
		mCacheImpl.removeAt(i);
		i--;
		}
		}
		}