Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c3eb5c6 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am 91cba7d9: am 48da8468: am 085cb2d2: Merge "Fix broken logic in isValidTarget" into lmp-dev 

* commit '91cba7d900395ebc101c24238e2b18d48bf1a4b2':
  Fix broken logic in isValidTarget
parents 3394ba66 5749cc09

core/java/android/transition/Transition.java

+2 −2
Original line number Diff line number Diff line
@@ -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)) {