diff options
| author | Winson Chung <winsonc@google.com> | 2011-10-17 07:07:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-17 07:07:00 -0700 |
| commit | eb95dde9d6b5f81832225dd0d2f78adfb378815b (patch) | |
| tree | 900b94775a8bb5394b86d09f17da9357e29213fb /src | |
| parent | 07b3b2f11ff35002f7353551185d8f31df0ed3a4 (diff) | |
| parent | ea45c2cb53b4d745f43850dcc4e794748425c5df (diff) | |
| download | android_packages_apps_Trebuchet-eb95dde9d6b5f81832225dd0d2f78adfb378815b.tar.gz android_packages_apps_Trebuchet-eb95dde9d6b5f81832225dd0d2f78adfb378815b.tar.bz2 android_packages_apps_Trebuchet-eb95dde9d6b5f81832225dd0d2f78adfb378815b.zip | |
am ea45c2cb: Merge "Fix NPE" into ics-mr0
* commit 'ea45c2cb53b4d745f43850dcc4e794748425c5df':
Fix NPE
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 59efc9e4e..69592815f 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()); |