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

Commit 67d7be9c authored by Alex Chau's avatar Alex Chau
Browse files

Add extra logs for launcher not initialized 

- Add logs to figure out why launcher model is not loaded properly in a test

Bug: 215233405
Test: None
Change-Id: If9e6a18ed2955928fe4ad57e6d7aa34e39c32036
parent e66e514f

src/com/android/launcher3/LauncherModel.java

+23 −1
Original line number Diff line number Diff line
@@ -100,7 +100,14 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 
    private boolean mModelDestroyed = false;

    public boolean isModelLoaded() {

        synchronized (mLock) {

            return mModelLoaded && mLoaderTask == null && !mModelDestroyed;

            boolean isModelLoaded = mModelLoaded && mLoaderTask == null && !mModelDestroyed;

            if (Utilities.IS_RUNNING_IN_TEST_HARNESS && !isModelLoaded) {

                Log.d(TestProtocol.LAUNCHER_NOT_INITIALIZED,

                        "Model not loaded - mModelLoaded: " + mModelLoaded

                                + ", mLoaderTask: " + mLoaderTask

                                + ", mModelDestroyed: " + mModelDestroyed);

            }

            return isModelLoaded;

        }

    }
@@ -249,6 +256,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 
     * Called when the model is destroyed

     */

    public void destroy() {

        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {

            Log.d(TestProtocol.LAUNCHER_NOT_INITIALIZED, "destroying model", new Exception());

        }

        mModelDestroyed = true;

        MODEL_EXECUTOR.execute(mModelDelegate::destroy);

    }
@@ -396,6 +406,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 
                    return true;

                } else {

                    stopLoader();

                    if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {

                        Log.d(TestProtocol.LAUNCHER_NOT_INITIALIZED, "starting loader");

                    }

                    mLoaderTask = new LoaderTask(

                            mApp, mBgAllAppsList, mBgDataModel, mModelDelegate, loaderResults);
@@ -413,6 +426,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 
     * @return true if an existing loader was stopped.

     */

    private boolean stopLoader() {

        if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {

            Log.d(TestProtocol.LAUNCHER_NOT_INITIALIZED, "stopping loader");

        }

        synchronized (mLock) {

            LoaderTask oldTask = mLoaderTask;

            mLoaderTask = null;
@@ -512,6 +528,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 
        }



        public void commit() {

            if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {

                Log.d(TestProtocol.LAUNCHER_NOT_INITIALIZED, "committing model");

            }

            synchronized (mLock) {

                // Everything loaded bind the data.

                mModelLoaded = true;
@@ -520,6 +539,9 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 


        @Override

        public void close() {

            if (Utilities.IS_RUNNING_IN_TEST_HARNESS) {

                Log.d(TestProtocol.LAUNCHER_NOT_INITIALIZED, "closing model");

            }

            synchronized (mLock) {

                // If we are still the last one to be scheduled, remove ourselves.

                if (mLoaderTask == mTask) {

src/com/android/launcher3/testing/TestProtocol.java

+1 −0
Original line number Diff line number Diff line
@@ -129,4 +129,5 @@ public final class TestProtocol { 
    public static final String NO_DROP_TARGET = "b/195031154";

    public static final String NULL_INT_SET = "b/200572078";

    public static final String MISSING_PROMISE_ICON = "b/202985412";

    public static final String LAUNCHER_NOT_INITIALIZED = "b/215233405";

}

tests/tapl/com/android/launcher3/tapl/LauncherInstrumentation.java

+2 −0
Original line number Diff line number Diff line
@@ -766,6 +766,8 @@ public final class LauncherInstrumentation { 
                    getBoolean(TestProtocol.TEST_INFO_RESPONSE_FIELD)) {

                return;

            }

            Log.d(TestProtocol.LAUNCHER_NOT_INITIALIZED,

                    "Launcher not yet initialized in attempt: " + i);

            SystemClock.sleep(100);

        }

        checkForAnomaly();