diff options
| author | Chet Haase <chet@google.com> | 2013-08-27 13:28:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 13:28:02 -0700 |
| commit | f87fa1b5a857c03aee04c173c80a6c4aab9b85f3 (patch) | |
| tree | 614e44b38306adcce34956b3b2c86379e68183b0 /core | |
| parent | e94aceabdbb1170fc1fc5f79f1239256c41bb73d (diff) | |
| parent | b9a474c29bfb2cc69710b0716f756cfea9e64c00 (diff) | |
| download | frameworks_base-f87fa1b5a857c03aee04c173c80a6c4aab9b85f3.zip frameworks_base-f87fa1b5a857c03aee04c173c80a6c4aab9b85f3.tar.gz frameworks_base-f87fa1b5a857c03aee04c173c80a6c4aab9b85f3.tar.bz2 | |
am b9a474c2: am f1c3f28e: Merge "Fix NPE when setting new LayoutTransition" into klp-dev
* commit 'b9a474c29bfb2cc69710b0716f756cfea9e64c00':
Fix NPE when setting new LayoutTransition
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) { |