commit 57436d3f7e7fca99400a9b90e93491e892d135ae
author George Mount <mount@google.com> Mon May 04 22:08:02 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 04 22:08:03 2015 +0000
tree 30f98736e9c204416f6e5af89ebb45cc99d87e0f
parent f455986a45328614c8dd07a4d60a30b9ddc3d994
parent f586c925d5199864a1087d153086079004b874e3

Merge "Fix potential NPE in internal isValidTarget method." into mnc-dev

core/java/android/transition/Transition.java

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 @@
      * 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;