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

Commit 2bf4af25 authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "Atom ProcessStartTime latency should be diff on uptimes." into tm-dev am: 7d172495 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17729342



Change-Id: I9a8f1e2f793bc26971b53cdaecead247b9808ce3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c4717259 7d172495

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -4821,7 +4821,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
            }















            checkTime(startTime, "attachApplicationLocked: immediately before bindApplication");













            bindApplicationTimeMillis = SystemClock.elapsedRealtime();













            bindApplicationTimeMillis = SystemClock.uptimeMillis();















            mAtmInternal.preBindApplication(app.getWindowProcessController());















            final ActiveInstrumentation instr2 = app.getActiveInstrumentation();















            if (mPlatformCompat != null) {










@@ -4969,9 +4969,9 @@ public class ActivityManagerService extends IActivityManager.Stub













                pid,















                app.info.packageName,















                FrameworkStatsLog.PROCESS_START_TIME__TYPE__COLD,













                app.getStartTime(),













                (int) (bindApplicationTimeMillis - app.getStartTime()),













                (int) (SystemClock.elapsedRealtime() - app.getStartTime()),













                app.getStartElapsedTime(),













                (int) (bindApplicationTimeMillis - app.getStartUptime()),













                (int) (SystemClock.uptimeMillis() - app.getStartUptime()),















                app.getHostingRecord().getType(),















                (app.getHostingRecord().getName() != null ? app.getHostingRecord().getName() : ""));















        return true;