diff options
| author | Winson Chung <winsonc@google.com> | 2011-10-14 14:10:41 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-14 14:10:41 -0700 |
| commit | ea45c2cb53b4d745f43850dcc4e794748425c5df (patch) | |
| tree | 92d1badcd0c3cd0b9d1de716ffdf95aa2adf6c1a /src | |
| parent | d2c1f80aa73bef9d7fb5991ec29ea7a7b2e38f90 (diff) | |
| parent | 9d906c7742af73160df257a40a702e1cc4f87899 (diff) | |
| download | android_packages_apps_Trebuchet-ea45c2cb53b4d745f43850dcc4e794748425c5df.tar.gz android_packages_apps_Trebuchet-ea45c2cb53b4d745f43850dcc4e794748425c5df.tar.bz2 android_packages_apps_Trebuchet-ea45c2cb53b4d745f43850dcc4e794748425c5df.zip | |
Merge "Fix NPE" into ics-mr0
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 0ed512909..dc7b77e86 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -246,7 +246,9 @@ public final class Launcher extends Activity private Runnable mBuildLayersRunnable = new Runnable() { public void run() { - mWorkspace.buildPageHardwareLayers(); + if (mWorkspace != null) { + mWorkspace.buildPageHardwareLayers(); + } } }; @@ -1260,6 +1262,7 @@ public final class Launcher extends Activity // Remove all pending runnables mHandler.removeMessages(ADVANCE_MSG); mHandler.removeMessages(0); + mWorkspace.removeCallbacks(mBuildLayersRunnable); // Stop callbacks from LauncherModel LauncherApplication app = ((LauncherApplication) getApplication()); |