summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2015-06-25 20:55:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-25 20:55:37 +0000
commitd9f3aa58d7e651dfbe9b395086040887d32d5a98 (patch)
tree2c619801b4bdbd5c475491e1b6a916c82104745b
parente71c6e3832a963ed3cfa8c124374799f774eccb3 (diff)
parent5697c323a5647174530e13dcb31c393933ac594e (diff)
downloadframeworks_base-d9f3aa58d7e651dfbe9b395086040887d32d5a98.zip
frameworks_base-d9f3aa58d7e651dfbe9b395086040887d32d5a98.tar.gz
frameworks_base-d9f3aa58d7e651dfbe9b395086040887d32d5a98.tar.bz2
Merge "Fix removeTarget to remove by ID instead of index." into mnc-dev
-rw-r--r--core/java/android/transition/Transition.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/transition/Transition.java b/core/java/android/transition/Transition.java
index c61ca4e..868b262 100644
--- a/core/java/android/transition/Transition.java
+++ b/core/java/android/transition/Transition.java
@@ -1046,7 +1046,7 @@ public abstract class Transition implements Cloneable {
*/
public Transition removeTarget(int targetId) {
if (targetId > 0) {
- mTargetIds.remove(targetId);
+ mTargetIds.remove((Integer)targetId);
}
return this;
}