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

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

Merge "Adding logging for for the case whe Launcher activity is not resumed after Back" into main

parents 1979abe3 451eebd4

src/com/android/launcher3/BaseActivity.java

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.launcher3;



import static com.android.launcher3.testing.shared.TestProtocol.ACTIVITY_NOT_RESUMED_AFTER_BACK;

import static com.android.launcher3.testing.shared.TestProtocol.sDebugTracing;

import static com.android.launcher3.util.FlagDebugUtils.appendFlag;

import static com.android.launcher3.util.FlagDebugUtils.formatFlagChange;

import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_TASK;
@@ -308,6 +310,9 @@ public abstract class BaseActivity extends Activity implements ActivityContext { 
     * Sets the activity to appear as paused.

     */

    public void setPaused() {

        if (sDebugTracing) {

            Log.d(ACTIVITY_NOT_RESUMED_AFTER_BACK, "Activity setPaused: " + this, new Throwable());

        }

        removeActivityFlags(ACTIVITY_STATE_RESUMED | ACTIVITY_STATE_DEFERRED_RESUMED);

    }
@@ -315,6 +320,7 @@ public abstract class BaseActivity extends Activity implements ActivityContext { 
     * Sets the activity to appear as resumed.

     */

    public void setResumed() {

        if (sDebugTracing) Log.d(ACTIVITY_NOT_RESUMED_AFTER_BACK, "Activity setResumed: " + this);

        addActivityFlags(ACTIVITY_STATE_RESUMED | ACTIVITY_STATE_USER_ACTIVE);

        removeActivityFlags(ACTIVITY_STATE_USER_WILL_BE_ACTIVE);

    }

tests/multivalentTests/shared/com/android/launcher3/testing/shared/TestProtocol.java

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ public final class TestProtocol { 
    public static final String ICON_MISSING = "b/282963545";

    public static final String OVERVIEW_OVER_HOME = "b/279059025";

    public static final String UIOBJECT_STALE_ELEMENT = "b/319501259";

    public static final String ACTIVITY_NOT_RESUMED_AFTER_BACK = "b/322823209";



    public static final String REQUEST_EMULATE_DISPLAY = "emulate-display";

    public static final String REQUEST_STOP_EMULATE_DISPLAY = "stop-emulate-display";