commit 95f3bcdce0b026369d924982dd3315da8dffaf3a
author Chet Haase <chet@google.com> Wed Sep 03 15:19:28 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 03 15:19:29 2014 +0000
tree b550892a52bfac5af90f0f551d7b133684f1be05
parent 67b4b2cdb429259ffffbff3f42783037b616a749
parent 5a7cf3eeeb208c2dac52541cb09b519b4342a5ff

Merge "Fix TransitionManager.go() to allow null transitions" into lmp-dev

core/java/android/transition/TransitionManager.java

diff --git a/core/java/android/transition/TransitionManager.java b/core/java/android/transition/TransitionManager.java
index ce3cc2f..7bd6287 100644
--- a/core/java/android/transition/TransitionManager.java
+++ b/core/java/android/transition/TransitionManager.java
@@ -182,11 +182,15 @@
 
         final ViewGroup sceneRoot = scene.getSceneRoot();
 
-        Transition transitionClone = transition.clone();
-        transitionClone.setSceneRoot(sceneRoot);
+        Transition transitionClone = null;
+        if (transition != null) {
+            transitionClone = transition.clone();
+            transitionClone.setSceneRoot(sceneRoot);
+        }
 
         Scene oldScene = Scene.getCurrentScene(sceneRoot);
-        if (oldScene != null && oldScene.isCreatedFromLayoutResource()) {
+        if (oldScene != null && transitionClone != null &&
+                oldScene.isCreatedFromLayoutResource()) {
             transitionClone.setCanRemoveViews(true);
         }