Merge "Fix TransitionManager.go with null Transition." (9b69b1b6) · Commits · e / os / android_frameworks_base

core/java/android/transition/TransitionManager.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -185,17 +185,16 @@ public class TransitionManager {

		final ViewGroup sceneRoot = scene.getSceneRoot();
		if (!sPendingTransitions.contains(sceneRoot)) {
		if (transition == null) {
		scene.enter();
		} else {
		sPendingTransitions.add(sceneRoot);

		Transition transitionClone = null;
		if (transition != null) {
		transitionClone = transition.clone();
		Transition transitionClone = transition.clone();
		transitionClone.setSceneRoot(sceneRoot);
		}

		Scene oldScene = Scene.getCurrentScene(sceneRoot);
		if (oldScene != null && transitionClone != null &&
		oldScene.isCreatedFromLayoutResource()) {
		if (oldScene != null && oldScene.isCreatedFromLayoutResource()) {
		transitionClone.setCanRemoveViews(true);
		}

		@@ -206,6 +205,7 @@ public class TransitionManager {
		sceneChangeRunTransition(sceneRoot, transitionClone);
		}
		}
		}

		private static ArrayMap<ViewGroup, ArrayList<Transition>> getRunningTransitions() {
		WeakReference<ArrayMap<ViewGroup, ArrayList<Transition>>> runningTransitions =