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

Merge commit '2347b2335b26edc5b7145759cc8a727fc712b970' * commit '2347b2335b26edc5b7145759cc8a727fc712b970': Maybe this will silence http://b/2460740
2010-03-01 18:34:15 -08:00
parent 384fb17576 2347b2335b
commit a5ecf71e57
1 changed files with 2 additions and 1 deletions
@@ -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);