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

Commit 9c377bd2 authored Oct 05, 2012 by Svetoslav Ganov Committed by Android Git Automerger Oct 05, 2012

am 481a0aac: am 88ae2e2a: am d9c99124: Merge "Incorrect temporary detach of...

am 481a0aac: am 88ae2e2a: am d9c99124: Merge "Incorrect temporary detach of accessibility focused view may lead to a crash." into jb-mr1-dev

* commit '481a0aac':
  Incorrect temporary detach of accessibility focused view may lead to a crash.

parents dde8e78e 481a0aac

core/java/android/view/ViewGroup.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -4006,7 +4006,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		* @see #removeDetachedView(View, boolean)
		*/
		protected void detachViewFromParent(View child) {
		child.clearAccessibilityFocus();
		removeFromArray(indexOfChild(child));
		}

		@@ -4028,7 +4027,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		* @see #removeDetachedView(View, boolean)
		*/
		protected void detachViewFromParent(int index) {
		getChildAt(index).clearAccessibilityFocus();
		removeFromArray(index);
		}

core/java/android/view/ViewRootImpl.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -2382,7 +2382,13 @@ public final class ViewRootImpl implements ViewParent,
		mAccessibilityFocusedHost.getDrawingRect(bounds);
		if (mView instanceof ViewGroup) {
		ViewGroup viewGroup = (ViewGroup) mView;
		try {
		viewGroup.offsetDescendantRectToMyCoords(mAccessibilityFocusedHost, bounds);
		} catch (IllegalArgumentException iae) {
		Log.e(TAG, "Temporary detached view that was neither removed not reattached: "
		+ mAccessibilityFocusedHost);
		return;
		}
		}
		} else {
		if (mAccessibilityFocusedVirtualView == null) {