am 96ef9f68: am bf5350db: fix 2460740 com.android.launcher2: java.lang.NullPointerException at com.android.launcher2.AllAppsView.saveAppsList(AllAppsView.java:1270)

Merge commit '96ef9f68a43604c99cd18537a6c8e9d1c5049c31'

* commit '96ef9f68a43604c99cd18537a6c8e9d1c5049c31':
  fix 2460740 com.android.launcher2: java.lang.NullPointerException at
This commit is contained in:
Joe Onorato
2010-02-22 15:07:16 -08:00
committed by Android Git Automerger

View File

@@ -1266,24 +1266,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);
}
}