commit ec0ab42a847835087da2c8619f799be8a8247f43
author George Mount <mount@google.com> Thu Sep 18 23:01:05 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 18 23:01:05 2014 +0000
tree 4cdebb0067e9ed84b1f173b56a1681f1ba4abd58
parent 1bd765e7b127e0b5baa0ec0c9aaba992254419f5
parent 7343ba2f80e9d58f97da6753703e02c934686177

am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev

* commit '085cb2d2f23ee497ddfb94b970da27d782b49dc0':
  Fix broken logic in isValidTarget

core/java/android/transition/Transition.java

diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java
index b677888..c850f71 100644
--- a/core/java/android/transition/Transition.java
+++ b/core/java/android/transition/Transition.java
@@ -814,8 +814,8 @@
             }
         }
         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)) {