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

Commit e1c8f87c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Adding tracing for a lab-only flake" into ub-launcher3-master

parents d2b03972 ce25a2bf

quickstep/recents_ui_overrides/src/com/android/quickstep/QuickstepTestInformationHandler.java

+8 −0
Original line number Diff line number Diff line
@@ -4,7 +4,10 @@ import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; 


import android.content.Context;

import android.os.Bundle;

import android.util.Log;



import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.testing.TestInformationHandler;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.uioverrides.states.OverviewState;
@@ -109,6 +112,11 @@ public class QuickstepTestInformationHandler extends TestInformationHandler { 


    @Override

    protected boolean isLauncherInitialized() {

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE,

                    "isLauncherInitialized.TouchInteractionService.isInitialized=" +

                            TouchInteractionService.isInitialized());

        }

        return super.isLauncherInitialized() && TouchInteractionService.isInitialized();

    }

}

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,8 @@ import androidx.annotation.UiThread; 
import androidx.annotation.WorkerThread;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherAppState;

import com.android.launcher3.Utilities;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.config.FeatureFlags;
@@ -131,6 +133,9 @@ public class TouchInteractionService extends Service implements 
                    .setProxy(proxy));

            MAIN_EXECUTOR.execute(TouchInteractionService.this::initInputMonitor);

            MAIN_EXECUTOR.execute(() -> preloadOverview(true /* fromInit */));

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE, "TIS initialized");

            }

            sIsInitialized = true;

        }
@@ -380,6 +385,9 @@ public class TouchInteractionService extends Service implements 


    @Override

    public void onDestroy() {

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE, "TIS destroyed");

        }

        sIsInitialized = false;

        if (mDeviceState.isUserUnlocked()) {

            mInputConsumer.unregisterInputConsumer();

src/com/android/launcher3/LauncherModel.java

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.launcher3.model.UserLockStateChangedTask; 
import com.android.launcher3.pm.InstallSessionTracker;

import com.android.launcher3.pm.PackageInstallInfo;

import com.android.launcher3.shortcuts.DeepShortcutManager;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.IntSparseArrayMap;

import com.android.launcher3.util.ItemInfoMatcher;

import com.android.launcher3.util.PackageUserKey;
@@ -92,6 +93,10 @@ public class LauncherModel extends LauncherApps.Callback implements InstallSessi 
    private boolean mModelLoaded;

    public boolean isModelLoaded() {

        synchronized (mLock) {

            if (TestProtocol.sDebugTracing) {

                Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE,

                        "isModelLoaded: " + mModelLoaded + ", " + mLoaderTask);

            }

            return mModelLoaded && mLoaderTask == null;

        }

    }

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

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.Bitmap; 
import android.graphics.Color;

import android.os.Bundle;

import android.os.Debug;

import android.util.Log;

import android.view.View;



import com.android.launcher3.DeviceProfile;
@@ -176,6 +177,11 @@ public class TestInformationHandler implements ResourceBasedOverride { 
    }



    protected boolean isLauncherInitialized() {

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.LAUNCHER_DIDNT_INITIALIZE,

                    "isLauncherInitialized " + Launcher.ACTIVITY_TRACKER.getCreatedActivity() + ", "

                            + LauncherAppState.getInstance(mContext).getModel().isModelLoaded());

        }

        return Launcher.ACTIVITY_TRACKER.getCreatedActivity() == null

                || LauncherAppState.getInstance(mContext).getModel().isModelLoaded();

    }

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

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

    public static final String APP_NOT_DISABLED = "b/139891609";

    public static final String NO_CONTEXT_MENU = "b/141770616";

    public static final String LAUNCHER_DIDNT_INITIALIZE = "b/142514365";

}