fix 2460740 com.android.launcher2: java.lang.NullPointerException at
com.android.launcher2.AllAppsView$RolloRS.saveAppsList(AllAppsView.java:1270)
This commit is contained in:
@@ -1265,24 +1265,23 @@ public class AllAppsView extends RSSurfaceView
|
|||||||
* Send the apps list structures to RS.
|
* Send the apps list structures to RS.
|
||||||
*/
|
*/
|
||||||
private void saveAppsList() {
|
private void saveAppsList() {
|
||||||
mRS.contextBindRootScript(null);
|
|
||||||
|
|
||||||
mAllocIconIds.data(mIconIds);
|
|
||||||
mAllocLabelIds.data(mLabelIds);
|
|
||||||
|
|
||||||
if (mScript != null) { // this happens when we init it
|
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(mAllocIconIds, Defines.ALLOC_ICON_IDS);
|
||||||
mScript.bindAllocation(mAllocLabelIds, Defines.ALLOC_LABEL_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);
|
mRS.contextBindRootScript(mScript);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user