fix 2460740 com.android.launcher2: java.lang.NullPointerException at
com.android.launcher2.AllAppsView$RolloRS.saveAppsList(AllAppsView.java:1270)
diff --git a/src/com/android/launcher2/AllAppsView.java b/src/com/android/launcher2/AllAppsView.java
index 336f117..f800881 100644
--- a/src/com/android/launcher2/AllAppsView.java
+++ b/src/com/android/launcher2/AllAppsView.java
@@ -1265,24 +1265,23 @@
* 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();
- }
- if (mScript != null) {
+ // 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();
+ }
+
mRS.contextBindRootScript(mScript);
}
}