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

Commit 0c867c02 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Avoid misleading log while warm launch"

parents 16d3ef6a 2f37c0d5

services/core/java/com/android/server/wm/ActivityTaskSupervisor.java

+1 −3
Original line number Diff line number Diff line
@@ -789,7 +789,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 


            // schedule launch ticks to collect information about slow apps.

            r.startLaunchTickingLocked();



            r.lastLaunchTime = SystemClock.uptimeMillis();

            r.setProcess(proc);



            // Ensure activity is allowed to be resumed after process has set.
@@ -835,8 +835,6 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
            final IActivityClientController activityClientController =

                    proc.hasEverLaunchedActivity() ? null : mService.mActivityClientController;

            r.launchCount++;

            r.lastLaunchTime = SystemClock.uptimeMillis();

            proc.setLastActivityLaunchTime(r.lastLaunchTime);



            if (DEBUG_ALL) Slog.v(TAG, "Launching: " + r);