commit cd2b01416febb5bf50ed5ede1544dea33fee3b0b
author Winson Chung <winsonc@google.com> Wed Jun 08 16:02:26 2011 -0700
committer Winson Chung <winsonc@google.com> Wed Jun 08 16:19:08 2011 -0700
tree 7c9805e66fb15c507c739b9d3247e083057d2480
parent 9578bde6a903925fbda2ecf738c7b00d6fa4026d

Removing old Launcher callback reference from LauncherModel when the activity is destroyed.

Change-Id: I288d2bd7e305c2cf9bdeec5357997d566d5205b7

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index eb533fe..2d63b3f 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1495,6 +1495,11 @@
     public void onDestroy() {
         super.onDestroy();
 
+        // Stop callbacks from LauncherModel
+        LauncherApplication app = ((LauncherApplication) getApplication());
+        mModel.stopLoader();
+        app.setLauncher(null);
+
         try {
             mAppWidgetHost.stopListening();
         } catch (NullPointerException ex) {
@@ -1506,7 +1511,6 @@
 
         TextKeyListener.getInstance().release();
 
-        mModel.stopLoader();
 
         unbindDesktopItems();