diff options
| author | George Mount <mount@google.com> | 2014-09-18 11:21:09 -0700 |
|---|---|---|
| committer | George Mount <mount@google.com> | 2014-09-18 11:21:09 -0700 |
| commit | cc82424b449f9d106d8d4caee74ad869d0e620ce (patch) | |
| tree | 717b76404f9e9bb436f93adee3890e15d7be6692 /core/java/android/transition | |
| parent | 61ee1eda0afb78c4ded09ac516f58283191e38df (diff) | |
| download | frameworks_base-cc82424b449f9d106d8d4caee74ad869d0e620ce.zip frameworks_base-cc82424b449f9d106d8d4caee74ad869d0e620ce.tar.gz frameworks_base-cc82424b449f9d106d8d4caee74ad869d0e620ce.tar.bz2 | |
Fix broken logic in isValidTarget
Bug 17553253
Change-Id: I9f3f2c80e59128fd5f8d4b1b2a67692c00804f62
Diffstat (limited to 'core/java/android/transition')
| -rw-r--r-- | core/java/android/transition/Transition.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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)) { |