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

Commit ba839ffa authored by Liam Mark's avatar Liam Mark Committed by Steve Kondik
Browse files

ActivityManager: Update timeline debug statements 

Update the timeline debug messages so that
'ActivityManager' is not used as the tag in log
messages as it interferes with some CTS tests.
CRs-fixed: 628703

Change-Id: I18c04eb47263246b6cf293210ba603127be99bd9
parent a20a47c9

core/java/android/app/ActivityManagerNative.java

+4 −2
Original line number Diff line number Diff line
@@ -2064,6 +2064,8 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM 


class ActivityManagerProxy implements IActivityManager

{

    static final String TAG_TIMELINE = "Timeline";



    public ActivityManagerProxy(IBinder remote)

    {

        mRemote = remote;
@@ -2082,7 +2084,7 @@ class ActivityManagerProxy implements IActivityManager 
        Parcel reply = Parcel.obtain();



        if (intent.getComponent() != null) {

            Log.i("ActivityManager", "Timeline: Activity_launch_request id:"

            Log.i(TAG_TIMELINE, "Timeline: Activity_launch_request id:"

                    + intent.getComponent().getPackageName() + " time:"

                    + SystemClock.uptimeMillis());

        }
@@ -2436,7 +2438,7 @@ class ActivityManagerProxy implements IActivityManager 
    public void activityIdle(IBinder token, Configuration config, boolean stopProfiling)

            throws RemoteException

    {

        Log.i("ActivityManager", "Timeline: Activity_idle id: " + token + " time:"

        Log.i(TAG_TIMELINE, "Timeline: Activity_idle id: " + token + " time:"

                + SystemClock.uptimeMillis());

        Parcel data = Parcel.obtain();

        Parcel reply = Parcel.obtain();

services/java/com/android/server/am/ActivityRecord.java

+2 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import java.util.HashSet; 
 */

final class ActivityRecord {

    static final String TAG = ActivityManagerService.TAG;

    static final String TAG_TIMELINE = "Timeline";

    static final boolean DEBUG_SAVED_STATE = ActivityStackSupervisor.DEBUG_SAVED_STATE;

    final public static String RECENTS_PACKAGE_NAME = "com.android.systemui.recent";
@@ -929,7 +930,7 @@ final class ActivityRecord { 
                service.scheduleAppGcsLocked();

            }

        }

        Log.i(ActivityManagerService.TAG, "Timeline: Activity_windows_visible id: "

        Log.i(TAG_TIMELINE, "Timeline: Activity_windows_visible id: "

                + this + " time:" + SystemClock.uptimeMillis());

    }