am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev (511452cf) · Commits · e / os / android_frameworks_base

core/java/android/app/EnterTransitionCoordinator.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -322,6 +322,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
		if (mListener != null) {
		mListener.onRejectSharedElements(rejectedSnapshots);
		}
		removeNullViews(rejectedSnapshots);
		startRejectedAnimations(rejectedSnapshots);

		// Now start shared element transition
		@@ -370,6 +371,16 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
		}
		}

		private static void removeNullViews(ArrayList<View> views) {
		if (views != null) {
		for (int i = views.size() - 1; i >= 0; i--) {
		if (views.get(i) == null) {
		views.remove(i);
		}
		}
		}
		}

		private void onTakeSharedElements() {
		if (!mIsReadyForTransition \|\| mSharedElementsBundle == null) {
		return;