diff options
| author | George Mount <mount@google.com> | 2014-07-15 10:41:50 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2014-07-15 22:24:58 +0000 |
| commit | e3b50aecfd913d3032460a99224803ba688bab27 (patch) | |
| tree | 808d54e7b5a07cc0c033572053715eeda99dbce0 /core/java/android/transition | |
| parent | 09e0f360fc17d07cb1615c48f281fee83c8ffe6d (diff) | |
| download | frameworks_base-e3b50aecfd913d3032460a99224803ba688bab27.zip frameworks_base-e3b50aecfd913d3032460a99224803ba688bab27.tar.gz frameworks_base-e3b50aecfd913d3032460a99224803ba688bab27.tar.bz2 | |
Fix NPE during construction from XML.
Bug 16322214
Change-Id: Ie2811a54880ab60b607ae29d7df04b0636e67197
Diffstat (limited to 'core/java/android/transition')
| -rw-r--r-- | core/java/android/transition/TransitionSet.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/transition/TransitionSet.java b/core/java/android/transition/TransitionSet.java index c6005b9..363f97f 100644 --- a/core/java/android/transition/TransitionSet.java +++ b/core/java/android/transition/TransitionSet.java @@ -160,7 +160,7 @@ public class TransitionSet extends Transition { @Override public TransitionSet setDuration(long duration) { super.setDuration(duration); - if (mDuration >= 0) { + if (mDuration >= 0 && mTransitions != null) { int numTransitions = mTransitions.size(); for (int i = 0; i < numTransitions; ++i) { mTransitions.get(i).setDuration(duration); |