summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2011-03-15 11:29:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-15 11:29:56 -0700
commitc73c4a36d2cf5eb3eeeca97caca25c3920dbcfa0 (patch)
treef7f6dab920c48c39884ed489a1d974748157e6a2 /core/java
parentcffde30fc10ecdfca53877fbee61525028eb47ba (diff)
parentb37f7e59ee38472bdd3ca5fe66cc847890c862e2 (diff)
downloadframeworks_base-c73c4a36d2cf5eb3eeeca97caca25c3920dbcfa0.zip
frameworks_base-c73c4a36d2cf5eb3eeeca97caca25c3920dbcfa0.tar.gz
frameworks_base-c73c4a36d2cf5eb3eeeca97caca25c3920dbcfa0.tar.bz2
am b37f7e59: Merge changes I81fc2f90,I5e7fd759
* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2': Using proper key for removing from map. Removing wrong equals method in comparator.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/LocalActivityManager.java2
-rw-r--r--core/java/android/text/util/Linkify.java4
2 files changed, 1 insertions, 5 deletions
diff --git a/core/java/android/app/LocalActivityManager.java b/core/java/android/app/LocalActivityManager.java
index a24fcae..7845e03 100644
--- a/core/java/android/app/LocalActivityManager.java
+++ b/core/java/android/app/LocalActivityManager.java
@@ -380,7 +380,7 @@ public class LocalActivityManager {
if (r != null) {
win = performDestroy(r, finish);
if (finish) {
- mActivities.remove(r);
+ mActivities.remove(id);
}
}
return win;
diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java
index 9860588..e2293e4 100644
--- a/core/java/android/text/util/Linkify.java
+++ b/core/java/android/text/util/Linkify.java
@@ -498,10 +498,6 @@ public class Linkify {
return 0;
}
-
- public final boolean equals(Object o) {
- return false;
- }
};
Collections.sort(links, c);