diff options
| author | Joe Onorato <joeo@android.com> | 2010-03-01 18:34:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-03-01 18:34:15 -0800 |
| commit | a5ecf71e57cdc8f33898e1d63c1c2fbc5319289e (patch) | |
| tree | 171ab7bbc0b91c319859c7f82a8332953ec128f1 /src | |
| parent | 384fb175762de7ef5f13e2cd5eb6247a7ea25e67 (diff) | |
| parent | 2347b2335b26edc5b7145759cc8a727fc712b970 (diff) | |
| download | android_packages_apps_Trebuchet-a5ecf71e57cdc8f33898e1d63c1c2fbc5319289e.tar.gz android_packages_apps_Trebuchet-a5ecf71e57cdc8f33898e1d63c1c2fbc5319289e.tar.bz2 android_packages_apps_Trebuchet-a5ecf71e57cdc8f33898e1d63c1c2fbc5319289e.zip | |
am 2347b233: am 4700fed7: Maybe this will silence http://b/2460740
Merge commit '2347b2335b26edc5b7145759cc8a727fc712b970'
* commit '2347b2335b26edc5b7145759cc8a727fc712b970':
Maybe this will silence http://b/2460740
Diffstat (limited to 'src')
| -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 6a6db7da6..cf752509e 100644 --- a/src/com/android/launcher2/AllAppsView.java +++ b/src/com/android/launcher2/AllAppsView.java @@ -1266,7 +1266,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); |