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

Commit 3ab80bb7 authored by vadimt's avatar vadimt
Browse files

Enable debug tracing for a lab-only non-starting app from all apps

Bug: 132900132
Change-Id: I9c5bb51e49f865ea1e1d3d2209a8dfb149f66e87
parent 9e26fcca
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -112,11 +112,11 @@ public class TestInformationProvider extends ContentProvider {
                    break;
                }

                case TestProtocol.REQUEST_ENABLE_DRAG_LOGGING:
                case TestProtocol.REQUEST_ENABLE_DEBUG_TRACING:
                    TestProtocol.sDebugTracing = true;
                    break;

                case TestProtocol.REQUEST_DISABLE_DRAG_LOGGING:
                case TestProtocol.REQUEST_DISABLE_DEBUG_TRACING:
                    TestProtocol.sDebugTracing = false;
                    break;
            }
+8 −0
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ public abstract class BaseDraggingActivity extends BaseActivity

    public boolean startActivitySafely(View v, Intent intent, @Nullable ItemInfo item,
            @Nullable String sourceContainer) {
        if (com.android.launcher3.TestProtocol.sDebugTracing) {
            android.util.Log.d(com.android.launcher3.TestProtocol.NO_START_TAG,
                    "startActivitySafely 1");
        }
        if (mIsSafeModeEnabled && !Utilities.isSystemApp(this, intent)) {
            Toast.makeText(this, R.string.safemode_shortcut_error, Toast.LENGTH_SHORT).show();
            return false;
@@ -157,6 +161,10 @@ 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
                if (com.android.launcher3.TestProtocol.sDebugTracing) {
                    android.util.Log.d(com.android.launcher3.TestProtocol.NO_START_TAG,
                            "startActivitySafely 2");
                }
                startActivity(intent, optsBundle);
                AppLaunchTracker.INSTANCE.get(this).onStartApp(intent.getComponent(),
                        Process.myUserHandle(), sourceContainer);
+4 −0
Original line number Diff line number Diff line
@@ -1782,6 +1782,10 @@ public class Launcher extends BaseDraggingActivity implements LauncherExterns,

    public boolean startActivitySafely(View v, Intent intent, ItemInfo item,
            @Nullable String sourceContainer) {
        if (com.android.launcher3.TestProtocol.sDebugTracing) {
            android.util.Log.d(com.android.launcher3.TestProtocol.NO_START_TAG,
                    "startActivitySafely outer");
        }
        boolean success = super.startActivitySafely(v, intent, item, sourceContainer);
        if (success && v instanceof BubbleTextView) {
            // This is set to the view that launched the activity that navigated the user away
+3 −2
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ public final class TestProtocol {
    public static final String REQUEST_HOME_TO_ALL_APPS_SWIPE_HEIGHT =
            "home-to-all-apps-swipe-height";
    public static boolean sDebugTracing = false;
    public static final String REQUEST_ENABLE_DRAG_LOGGING = "enable-drag-logging";
    public static final String REQUEST_DISABLE_DRAG_LOGGING = "disable-drag-logging";
    public static final String REQUEST_ENABLE_DEBUG_TRACING = "enable-debug-tracing";
    public static final String REQUEST_DISABLE_DEBUG_TRACING = "disable-debug-tracing";
    public static final String NO_DRAG_TAG = "b/133009122";
    public static final String NO_START_TAG = "b/132900132";
}
+20 −0
Original line number Diff line number Diff line
@@ -66,14 +66,26 @@ public class ItemClickHandler {
    }

    private static void onClick(View v, String sourceContainer) {
        if (com.android.launcher3.TestProtocol.sDebugTracing) {
            android.util.Log.d(com.android.launcher3.TestProtocol.NO_START_TAG,
                    "onClick 1");
        }
        // Make sure that rogue clicks don't get through while allapps is launching, or after the
        // view has detached (it's possible for this to happen if the view is removed mid touch).
        if (v.getWindowToken() == null) {
            if (com.android.launcher3.TestProtocol.sDebugTracing) {
                android.util.Log.d(com.android.launcher3.TestProtocol.NO_START_TAG,
                        "onClick 2");
            }
            return;
        }

        Launcher launcher = Launcher.getLauncher(v.getContext());
        if (!launcher.getWorkspace().isFinishedSwitchingState()) {
            if (com.android.launcher3.TestProtocol.sDebugTracing) {
                android.util.Log.d(com.android.launcher3.TestProtocol.NO_START_TAG,
                        "onClick 3");
            }
            return;
        }

@@ -85,6 +97,10 @@ public class ItemClickHandler {
                onClickFolderIcon(v);
            }
        } else if (tag instanceof AppInfo) {
            if (com.android.launcher3.TestProtocol.sDebugTracing) {
                android.util.Log.d(com.android.launcher3.TestProtocol.NO_START_TAG,
                        "onClick 4");
            }
            startAppShortcutOrInfoActivity(v, (AppInfo) tag, launcher,
                    sourceContainer == null ? CONTAINER_ALL_APPS: sourceContainer);
        } else if (tag instanceof LauncherAppWidgetInfo) {
@@ -216,6 +232,10 @@ public class ItemClickHandler {

    private static void startAppShortcutOrInfoActivity(View v, ItemInfo item, Launcher launcher,
            @Nullable String sourceContainer) {
        if (com.android.launcher3.TestProtocol.sDebugTracing) {
            android.util.Log.d(com.android.launcher3.TestProtocol.NO_START_TAG,
                    "startAppShortcutOrInfoActivity");
        }
        Intent intent;
        if (item instanceof PromiseAppInfo) {
            PromiseAppInfo promiseAppInfo = (PromiseAppInfo) item;
Loading