From b62353ad1d1f540dee270be0c0d383ac108a290b Mon Sep 17 00:00:00 2001 From: Jozef BABJAK Date: Mon, 21 Feb 2011 15:19:00 +0100 Subject: Removing wrong equals method in comparator. This implementation of equals method has been likely created by template in an IDE. It is useless, possibly leading to poor performance and completely violating the contract of equals method as defined in Object base class. Change-Id: I5e7fd759b7bd9370b44d9374b57390c4e9feba02 --- core/java/android/text/util/Linkify.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java index 98605888c137..e2293e4660eb 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); -- cgit v1.2.3-59-g8ed1b From 6fe725ee5d943faaaa7ae9899b8613c90159d2dd Mon Sep 17 00:00:00 2001 From: Jozef BABJAK Date: Mon, 21 Feb 2011 15:33:59 +0100 Subject: Using proper key for removing from map. Window object was improperly used as a key for removing record from map. This was silenly ignored, because remove() method accepts Object. However, the ID should be used there which is type of String, i.e. the same ID which was used for lookup. Change-Id: I81fc2f90926a34414bf9042ddf4a2edff4c1fda1 --- core/java/android/app/LocalActivityManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/app/LocalActivityManager.java b/core/java/android/app/LocalActivityManager.java index a24fcae26639..7845e0379fb4 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; -- cgit v1.2.3-59-g8ed1b