Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b38947b authored by kholoud mohamed's avatar kholoud mohamed Committed by Kholoud Mohamed
Browse files

Fix crash when loading string cache 

Crash was caused by a null context in ModelDelegate

Fixes: 218305827
Test: manual
Change-Id: I1b046e24427dbdc6752ac100f488c428838ac31f
parent e424f57d

src/com/android/launcher3/graphics/PreviewSurfaceRenderer.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ import com.android.launcher3.graphics.LauncherPreviewRenderer.PreviewContext; 
import com.android.launcher3.model.BgDataModel;

import com.android.launcher3.model.BgDataModel;

import com.android.launcher3.model.GridSizeMigrationTaskV2;

import com.android.launcher3.model.GridSizeMigrationTaskV2;

import com.android.launcher3.model.LoaderTask;

import com.android.launcher3.model.LoaderTask;

import com.android.launcher3.model.ModelDelegate;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.ComponentKey;

import com.android.launcher3.util.RunnableList;

import com.android.launcher3.util.RunnableList;

import com.android.launcher3.util.Themes;

import com.android.launcher3.util.Themes;
@@ -156,9 +155,10 @@ public class PreviewSurfaceRenderer { 
            PreviewContext previewContext = new PreviewContext(inflationContext, mIdp);

            PreviewContext previewContext = new PreviewContext(inflationContext, mIdp);

            new LoaderTask(

            new LoaderTask(

                    LauncherAppState.getInstance(previewContext),

                    LauncherAppState.getInstance(previewContext),

                    null,

                    /* bgAllAppsList= */ null,

                    new BgDataModel(),

                    new BgDataModel(),

                    new ModelDelegate(), null) {

                    LauncherAppState.getInstance(previewContext).getModel().getModelDelegate(),

                    /* results= */ null) {





                @Override

                @Override

                public void run() {

                public void run() {

src/com/android/launcher3/model/ModelDelegate.java

+13 −5
Original line number Original line Diff line number Diff line
@@ -44,11 +44,7 @@ public class ModelDelegate implements ResourceBasedOverride { 
            boolean isPrimaryInstance) {

            boolean isPrimaryInstance) {

        ModelDelegate delegate = Overrides.getObject(

        ModelDelegate delegate = Overrides.getObject(

                ModelDelegate.class, context, R.string.model_delegate_class);

                ModelDelegate.class, context, R.string.model_delegate_class);

        delegate.mApp = app;

        delegate.init(context, app, appsList, dataModel, isPrimaryInstance);

        delegate.mAppsList = appsList;

        delegate.mDataModel = dataModel;

        delegate.mIsPrimaryInstance = isPrimaryInstance;

        delegate.mContext = context;

        return delegate;

        return delegate;

    }

    }
@@ -60,6 +56,18 @@ public class ModelDelegate implements ResourceBasedOverride { 




    public ModelDelegate() { }

    public ModelDelegate() { }





    /**

     * Initializes the object with the given params.

     */

    private void init(Context context, LauncherAppState app, AllAppsList appsList,

            BgDataModel dataModel, boolean isPrimaryInstance) {

        this.mApp = app;

        this.mAppsList = appsList;

        this.mDataModel = dataModel;

        this.mIsPrimaryInstance = isPrimaryInstance;

        this.mContext = context;

    }



    /**

    /**

     * Called periodically to validate and update any data

     * Called periodically to validate and update any data

     */

     */