Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '41fd9f8af6b93daec54dc3945f7c2809f67a5c79':
  Fix broken logic in isValidTarget
This commit is contained in:
George Mount
2014-09-18 23:10:50 +00:00
committed by Android Git Automerger
parent a3d53fcfc9 ec0ab42a84
commit b73087455b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/transition/Transition.java
View File

@@ -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)) {