From cc82424b449f9d106d8d4caee74ad869d0e620ce Mon Sep 17 00:00:00 2001 From: George Mount Date: Thu, 18 Sep 2014 11:21:09 -0700 Subject: [PATCH] Fix broken logic in isValidTarget Bug 17553253 Change-Id: I9f3f2c80e59128fd5f8d4b1b2a67692c00804f62 --- core/java/android/transition/Transition.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java index b677888852da1..c850f71314050 100644 --- a/core/java/android/transition/Transition.java +++ b/core/java/android/transition/Transition.java @@ -814,8 +814,8 @@ public abstract class Transition implements Cloneable { } } if (mTargetIds.size() == 0 && mTargets.size() == 0 && - (mTargetTypes == null || mTargetTypes.isEmpty() && - (mTargetNames == null || mTargetNames.isEmpty()))) { + (mTargetTypes == null || mTargetTypes.isEmpty()) && + (mTargetNames == null || mTargetNames.isEmpty())) { return true; } if (mTargetIds.contains(targetId) || mTargets.contains(target)) {