commit aaf7d1d13bd88bdeac5c56a9ab1d293fdaea3c11
author Sunny Goyal <sunnygoyal@google.com> Tue May 17 13:38:54 2016 -0700
committer Sunny Goyal <sunnygoyal@google.com> Tue May 17 14:42:10 2016 -0700
tree 3bff1ac0313c3c17a936340206b2dfc8a3cf0b91
parent 5b83d6ce8f7391aab67b7c53d972380fe0762ced

instead of unbinding items from the loader, unregistering listeners
in activity.onDestroy()

Bug: 28740269
Change-Id: I6bf2ad6aca43970fd10cfbcc113e609c227e07bf

src/com/android/launcher3/FolderInfo.java

diff --git a/src/com/android/launcher3/FolderInfo.java b/src/com/android/launcher3/FolderInfo.java
index 6c9d969..9a99852 100644
--- a/src/com/android/launcher3/FolderInfo.java
+++ b/src/com/android/launcher3/FolderInfo.java
@@ -109,10 +109,8 @@
         listeners.add(listener);
     }
 
-    void removeListener(FolderListener listener) {
-        if (listeners.contains(listener)) {
-            listeners.remove(listener);
-        }
+    public void removeListener(FolderListener listener) {
+        listeners.remove(listener);
     }
 
     public void itemsChanged(boolean animate) {
@@ -121,12 +119,6 @@
         }
     }
 
-    @Override
-    void unbind() {
-        super.unbind();
-        listeners.clear();
-    }
-
     public interface FolderListener {
         public void onAdd(ShortcutInfo item);
         public void onRemove(ShortcutInfo item);