commit a5ecf71e57cdc8f33898e1d63c1c2fbc5319289e
author Joe Onorato <joeo@android.com> Mon Mar 01 18:34:15 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 01 18:34:15 2010 -0800
tree 171ab7bbc0b91c319859c7f82a8332953ec128f1
parent 384fb175762de7ef5f13e2cd5eb6247a7ea25e67
parent 2347b2335b26edc5b7145759cc8a727fc712b970

am 2347b233: am 4700fed7: Maybe this will silence http://b/2460740

Merge commit '2347b2335b26edc5b7145759cc8a727fc712b970'

* commit '2347b2335b26edc5b7145759cc8a727fc712b970':
  Maybe this will silence http://b/2460740

src/com/android/launcher2/AllAppsView.java

diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 6a6db7d..cf75250 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -1266,7 +1266,8 @@
          * 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);