commit b8a9cb0e2b3b2a1bb250853a79b8ea2046ff3d6e
author Grace Kloba <klobag@google.com> Thu Aug 27 11:53:36 2009 -0700
committer Grace Kloba <klobag@google.com> Thu Aug 27 11:53:36 2009 -0700
tree 286b6bcc45a0ad7f2749efdb326f90762feadc71
parent 9f0d27c82baa6d838147afabdf6f0764bf265a21

Fix the activity leak in the Browser.

The IconListenerSet inside CombinedBookmarkHistoryActivity is static. So when
the activity is destroyed, it needs to remove its listener to avoid leak.

src/com/android/browser/BrowserHistoryPage.java

diff --git a/src/com/android/browser/BrowserHistoryPage.java b/src/com/android/browser/BrowserHistoryPage.java
index 42ca848..4a0f8c5 100644
--- a/src/com/android/browser/BrowserHistoryPage.java
+++ b/src/com/android/browser/BrowserHistoryPage.java
@@ -137,6 +137,13 @@
     }
 
     @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        CombinedBookmarkHistoryActivity.getIconListenerSet(getContentResolver())
+                .removeListener(mIconReceiver);
+    }
+
+    @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
         MenuInflater inflater = getMenuInflater();

src/com/android/browser/CombinedBookmarkHistoryActivity.java

diff --git a/src/com/android/browser/CombinedBookmarkHistoryActivity.java b/src/com/android/browser/CombinedBookmarkHistoryActivity.java
index 963f179..5678b44 100644
--- a/src/com/android/browser/CombinedBookmarkHistoryActivity.java
+++ b/src/com/android/browser/CombinedBookmarkHistoryActivity.java
@@ -59,6 +59,9 @@
         public void addListener(IconListener listener) {
             mListeners.add(listener);
         }
+        public void removeListener(IconListener listener) {
+            mListeners.remove(listener);
+        }
         public Bitmap getFavicon(String url) {
             return (Bitmap) mUrlsToIcons.get(url);
         }

src/com/android/browser/MostVisitedActivity.java

diff --git a/src/com/android/browser/MostVisitedActivity.java b/src/com/android/browser/MostVisitedActivity.java
index 704ee27..83342a1 100644
--- a/src/com/android/browser/MostVisitedActivity.java
+++ b/src/com/android/browser/MostVisitedActivity.java
@@ -42,12 +42,15 @@
 
     private MyAdapter   mAdapter;
 
+    // Instance of IconReceiver
+    private final IconReceiver mIconReceiver = new IconReceiver();
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mAdapter = new MyAdapter();
         CombinedBookmarkHistoryActivity.getIconListenerSet(getContentResolver())
-                .addListener(new IconReceiver());
+                .addListener(mIconReceiver);
         setListAdapter(mAdapter);
         ListView list = getListView();
         LayoutInflater factory = LayoutInflater.from(this);
@@ -57,6 +60,13 @@
         list.setEmptyView(v);
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        CombinedBookmarkHistoryActivity.getIconListenerSet(getContentResolver())
+               .removeListener(mIconReceiver);
+    }
+
     private class IconReceiver implements IconListener {
         public void onReceivedIcon(String url, Bitmap icon) {
             setListAdapter(mAdapter);