From bf5350db6166df369a4e22012bc0a7a122f39a51 Mon Sep 17 00:00:00 2001 From: Joe Onorato Date: Mon, 22 Feb 2010 14:46:10 -0800 Subject: [PATCH] fix 2460740 com.android.launcher2: java.lang.NullPointerException at com.android.launcher2.AllAppsView$RolloRS.saveAppsList(AllAppsView.java:1270) --- src/com/android/launcher2/AllAppsView.java | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java index 336f117d18..f8008816f3 100644 --- a/src/com/android/launcher2/AllAppsView.java +++ b/src/com/android/launcher2/AllAppsView.java @@ -1265,24 +1265,23 @@ public class AllAppsView extends RSSurfaceView * Send the apps list structures to RS. */ private void saveAppsList() { - mRS.contextBindRootScript(null); - - mAllocIconIds.data(mIconIds); - mAllocLabelIds.data(mLabelIds); - if (mScript != null) { // this happens when we init it + mRS.contextBindRootScript(null); + + mAllocIconIds.data(mIconIds); + mAllocLabelIds.data(mLabelIds); + mScript.bindAllocation(mAllocIconIds, Defines.ALLOC_ICON_IDS); mScript.bindAllocation(mAllocLabelIds, Defines.ALLOC_LABEL_IDS); - } - mState.save(); + mState.save(); + + // Note: mScript may be null if we haven't initialized it yet. + // In that case, this is a no-op. + if (mInvokeResetWAR != null) { + mInvokeResetWAR.execute(); + } - // Note: mScript may be null if we haven't initialized it yet. - // In that case, this is a no-op. - if (mInvokeResetWAR != null) { - mInvokeResetWAR.execute(); - } - if (mScript != null) { mRS.contextBindRootScript(mScript); } }