Merge "Throw IndexOutOfBoundsException for invalid start/count values" (d25c9018) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewGroup.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -4636,7 +4636,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}

		private void removeViewInternal(int index, View view) {

		if (mTransition != null) {
		mTransition.removeChild(this, view);
		}
		@@ -4729,12 +4728,17 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		}

		private void removeViewsInternal(int start, int count) {
		final int end = start + count;

		if (start < 0 \|\| count < 0 \|\| end > mChildrenCount) {
		throw new IndexOutOfBoundsException();
		}

		final View focused = mFocused;
		final boolean detach = mAttachInfo != null;
		boolean clearChildFocus = false;

		final View[] children = mChildren;
		final int end = start + count;

		for (int i = start; i < end; i++) {
		final View view = children[i];