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

Commit cf275c1b authored by vadimt's avatar vadimt
Browse files

Choosing better points to output "start" events for TAPL 

Now doing this before branching points, thus avoiding flakes when the
execution can go to an unexpected branch and not produce an event.

Bug: 153824894
Change-Id: If117da0498eaf2d94c9610552724981be34c6569
parent 047a54a2

src/com/android/launcher3/BaseActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ import com.android.launcher3.logging.StatsLogManager; 
import com.android.launcher3.logging.StatsLogUtils;

import com.android.launcher3.logging.StatsLogUtils.LogStateProvider;

import com.android.launcher3.logging.UserEventDispatcher;

import com.android.launcher3.testing.TestLogging;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.util.SystemUiController;

import com.android.launcher3.util.ViewCache;
@@ -332,7 +330,6 @@ public abstract class BaseActivity extends Activity implements LogStateProvider, 
            return;

        }

        try {

            TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "start: shortcut", packageName);

            getSystemService(LauncherApps.class).startShortcut(packageName, id, sourceBounds,

                    startActivityOptions, user);

        } catch (SecurityException | IllegalStateException e) {

src/com/android/launcher3/BaseDraggingActivity.java

+0 −3
Original line number Diff line number Diff line
@@ -41,8 +41,6 @@ import com.android.launcher3.LauncherSettings.Favorites; 
import com.android.launcher3.model.AppLaunchTracker;

import com.android.launcher3.model.data.ItemInfo;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.testing.TestLogging;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.touch.ItemClickHandler;

import com.android.launcher3.uioverrides.WallpaperColorInfo;

import com.android.launcher3.util.DefaultDisplay;
@@ -173,7 +171,6 @@ public abstract class BaseDraggingActivity extends BaseActivity 
                startShortcutIntentSafely(intent, optsBundle, item, sourceContainer);

            } else if (user == null || user.equals(Process.myUserHandle())) {

                // Could be launching some bookkeeping activity

                TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "start: activity", intent);

                startActivity(intent, optsBundle);

                AppLaunchTracker.INSTANCE.get(this).onStartApp(intent.getComponent(),

                        Process.myUserHandle(), sourceContainer);

src/com/android/launcher3/Launcher.java

+1 −0
Original line number Diff line number Diff line
@@ -1674,6 +1674,7 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns, 
    private void processShortcutFromDrop(PendingAddShortcutInfo info) {

        Intent intent = new Intent(Intent.ACTION_CREATE_SHORTCUT).setComponent(info.componentName);

        setWaitingForResult(PendingRequestArgs.forIntent(REQUEST_CREATE_SHORTCUT, intent, info));

        TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "start: processShortcutFromDrop");

        if (!info.activityInfo.startConfigActivity(this, REQUEST_CREATE_SHORTCUT)) {

            handleActivityResult(REQUEST_CREATE_SHORTCUT, RESULT_CANCELED, null);

        }

src/com/android/launcher3/LauncherAppWidgetHost.java

+3 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ import android.util.SparseArray; 
import android.widget.Toast;



import com.android.launcher3.model.WidgetsModel;

import com.android.launcher3.testing.TestLogging;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.widget.DeferredAppWidgetHostView;

import com.android.launcher3.widget.LauncherAppWidgetHostView;

import com.android.launcher3.widget.PendingAppWidgetHostView;
@@ -298,6 +300,7 @@ public class LauncherAppWidgetHost extends AppWidgetHost { 
        }



        try {

            TestLogging.recordEvent(TestProtocol.SEQUENCE_MAIN, "start: startConfigActivity");

            startAppWidgetConfigureActivityForResult(activity, widgetId, 0, requestCode, null);

        } catch (ActivityNotFoundException | SecurityException e) {

            Toast.makeText(activity, R.string.activity_not_found, Toast.LENGTH_SHORT).show();

src/com/android/launcher3/touch/ItemClickHandler.java

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ import com.android.launcher3.model.data.LauncherAppWidgetInfo; 
import com.android.launcher3.model.data.PromiseAppInfo;

import com.android.launcher3.model.data.WorkspaceItemInfo;

import com.android.launcher3.pm.InstallSessionHelper;

import com.android.launcher3.testing.TestLogging;

import com.android.launcher3.testing.TestProtocol;

import com.android.launcher3.util.PackageManagerHelper;

import com.android.launcher3.views.FloatingIconView;

import com.android.launcher3.widget.PendingAppWidgetHostView;
@@ -240,6 +242,8 @@ public class ItemClickHandler { 


    private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher,

            @Nullable String sourceContainer) {

        TestLogging.recordEvent(

                TestProtocol.SEQUENCE_MAIN, "start: startAppShortcutOrInfoActivity");

        Intent intent;

        if (item instanceof PromiseAppInfo) {

            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) item;