From f586c925d5199864a1087d153086079004b874e3 Mon Sep 17 00:00:00 2001 From: George Mount Date: Mon, 4 May 2015 15:01:55 -0700 Subject: [PATCH] Fix potential NPE in internal isValidTarget method. Bug 19805383 Change-Id: Ib22d86cca5e1225b12ed39ac988824eeb9c58bbd --- core/java/android/transition/Transition.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index c94204295716e..ebc2aac5242e5 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;