diff options
| author | George Mount <mount@google.com> | 2015-05-04 22:08:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-04 22:08:03 +0000 |
| commit | 57436d3f7e7fca99400a9b90e93491e892d135ae (patch) | |
| tree | 30f98736e9c204416f6e5af89ebb45cc99d87e0f /core/java | |
| parent | f455986a45328614c8dd07a4d60a30b9ddc3d994 (diff) | |
| parent | f586c925d5199864a1087d153086079004b874e3 (diff) | |
| download | frameworks_base-57436d3f7e7fca99400a9b90e93491e892d135ae.zip frameworks_base-57436d3f7e7fca99400a9b90e93491e892d135ae.tar.gz frameworks_base-57436d3f7e7fca99400a9b90e93491e892d135ae.tar.bz2 | |
Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/transition/Transition.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index c942042..ebc2aac 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -792,6 +792,9 @@ public abstract class Transition implements Cloneable { * views are ignored and only the ids are used). */ boolean isValidTarget(View target) { + if (target == null) { + return false; + } int targetId = target.getId(); if (mTargetIdExcludes != null && mTargetIdExcludes.contains(targetId)) { return false; |