Merge "Fixes NPE when target is already recycled." into main (9165dc2c) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewGroup.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -2836,7 +2836,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		} else {
		predecessor.next = next;
		}
		if (!target.isRecycled()) {
		target.recycle();
		}
		target = next;
		continue;
		}
		@@ -9050,6 +9052,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
		return target;
		}

		public boolean isRecycled() {
		return child == null;
		}

		public void recycle() {
		if (child == null) {
		throw new IllegalStateException("already recycled once");