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

Commit eef9541a authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Add finish logs for AppTask finish() paths as well" into main

parents f49879c9 97c8c367

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -7312,7 +7312,7 @@ public class Activity extends ContextThemeWrapper 
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private void finish(int finishTask) {

        if (DEBUG_FINISH_ACTIVITY) {

            Log.d("Instrumentation", "finishActivity: finishTask=" + finishTask, new Throwable());

            Log.d(Instrumentation.TAG, "finishActivity: finishTask=" + finishTask, new Throwable());

        }

        if (mParent == null) {

            int resultCode;

core/java/android/app/ActivityManager.java

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


package android.app;



import static android.app.Instrumentation.DEBUG_FINISH_ACTIVITY;

import static android.app.WindowConfiguration.activityTypeToString;

import static android.app.WindowConfiguration.windowingModeToString;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;
@@ -80,6 +81,7 @@ import android.os.WorkSource; 
import android.text.TextUtils;

import android.util.ArrayMap;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.Singleton;

import android.util.Size;

import android.view.WindowInsetsController.Appearance;
@@ -6011,6 +6013,10 @@ public class ActivityManager { 
         * Finishes all activities in this task and removes it from the recent tasks list.

         */

        public void finishAndRemoveTask() {

            if (DEBUG_FINISH_ACTIVITY) {

                Log.d(Instrumentation.TAG, "AppTask#finishAndRemoveTask: task="

                        + getTaskInfo(), new Throwable());

            }

            try {

                mAppTaskImpl.finishAndRemoveTask();

            } catch (RemoteException e) {

core/java/android/app/Instrumentation.java

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ public class Instrumentation { 
     */

    public static final String REPORT_KEY_STREAMRESULT = "stream";



    private static final String TAG = "Instrumentation";

    static final String TAG = "Instrumentation";



    private static final long CONNECT_TIMEOUT_MILLIS = 60_000;