PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge "Fix NPE" into ics-mr0

Browse Source
This commit is contained in:
Winson Chung
2011-10-14 14:10:41 -07:00
committed by Android (Google) Code Review
parent d2c1f80aa7 9d906c7742
commit ea45c2cb53
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Launcher.java
+4 -1
View File
@@ -246,7 +246,9 @@ public final class Launcher extends Activity
private Runnable mBuildLayersRunnable = new Runnable() { private Runnable mBuildLayersRunnable = new Runnable() {
public void run() { public void run() {
mWorkspace.buildPageHardwareLayers(); if (mWorkspace != null) {
mWorkspace.buildPageHardwareLayers();
}
} }
}; };
@@ -1260,6 +1262,7 @@ public final class Launcher extends Activity
// Remove all pending runnables // Remove all pending runnables
mHandler.removeMessages(ADVANCE_MSG); mHandler.removeMessages(ADVANCE_MSG);
mHandler.removeMessages(0); mHandler.removeMessages(0);
mWorkspace.removeCallbacks(mBuildLayersRunnable);
// Stop callbacks from LauncherModel // Stop callbacks from LauncherModel
LauncherApplication app = ((LauncherApplication) getApplication()); LauncherApplication app = ((LauncherApplication) getApplication());