diff options
| author | Joe Onorato <joeo@android.com> | 2010-03-01 17:57:23 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-01 17:57:23 -0800 |
| commit | 2347b2335b26edc5b7145759cc8a727fc712b970 (patch) | |
| tree | db47ed3ea5b48c745b2dce21db2cb5c87c76e8af /src/com/android/launcher2 | |
| parent | 96ef9f68a43604c99cd18537a6c8e9d1c5049c31 (diff) | |
| parent | 4700fed72b619a09a0d9cac93e86625b95c730dc (diff) | |
| download | android_packages_apps_Trebuchet-2347b2335b26edc5b7145759cc8a727fc712b970.tar.gz android_packages_apps_Trebuchet-2347b2335b26edc5b7145759cc8a727fc712b970.tar.bz2 android_packages_apps_Trebuchet-2347b2335b26edc5b7145759cc8a727fc712b970.zip | |
am 4700fed7: Maybe this will silence http://b/2460740
Merge commit '4700fed72b619a09a0d9cac93e86625b95c730dc' into eclair-plus-aosp
* commit '4700fed72b619a09a0d9cac93e86625b95c730dc':
Maybe this will silence http://b/2460740
Diffstat (limited to 'src/com/android/launcher2')
| -rw-r--r-- | src/com/android/launcher2/AllAppsView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java index f8008816f..fe9518b93 100644 --- a/src/com/android/launcher2/AllAppsView.java +++ b/src/com/android/launcher2/AllAppsView.java @@ -1265,7 +1265,8 @@ public class AllAppsView extends RSSurfaceView * Send the apps list structures to RS. */ private void saveAppsList() { - if (mScript != null) { // this happens when we init it + // WTF: how could mScript be not null but mAllocIconIds null b/2460740. + if (mScript != null && mAllocIconIds != null) { mRS.contextBindRootScript(null); mAllocIconIds.data(mIconIds); |