diff options
| author | Chet Haase <chet@google.com> | 2013-08-27 19:49:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-27 19:50:43 +0000 |
| commit | f1c3f28eb9e87ddc6b5a3fdc5a3553b8134aff61 (patch) | |
| tree | a99ee8f3ee3a9002f2052cd3e18570f96ccb79e5 /core | |
| parent | 6d7771b575ec9303515128e98fcb67689414ac6e (diff) | |
| parent | fee6f2b3d30fe222486a70a773683e21d9dd12bf (diff) | |
| download | frameworks_base-f1c3f28eb9e87ddc6b5a3fdc5a3553b8134aff61.zip frameworks_base-f1c3f28eb9e87ddc6b5a3fdc5a3553b8134aff61.tar.gz frameworks_base-f1c3f28eb9e87ddc6b5a3fdc5a3553b8134aff61.tar.bz2 | |
Merge "Fix NPE when setting new LayoutTransition" into klp-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewGroup.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/ViewGroup.java b/core/java/android/view/ViewGroup.java index d68c410..03a9c37 100644 --- a/core/java/android/view/ViewGroup.java +++ b/core/java/android/view/ViewGroup.java @@ -3865,8 +3865,9 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager */ public void setLayoutTransition(LayoutTransition transition) { if (mTransition != null) { - mTransition.cancel(); - mTransition.removeTransitionListener(mLayoutTransitionListener); + LayoutTransition previousTransition = mTransition; + previousTransition.cancel(); + previousTransition.removeTransitionListener(mLayoutTransitionListener); } mTransition = transition; if (mTransition != null) { |