Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add TRON logging for bindApplication" into oc-dev

Browse Source 
am: 802d008e1b

Change-Id: Idc3dba8c4559098b0b06d8159000fe7857675887
This commit is contained in:
Jorim Jaggi
2017-05-05 15:47:24 +00:00
committed by android-build-merger
parent 87c49233f3 802d008e1b
commit fa5252f628
3 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
proto/src/metrics_constants.proto
View File

@@ -3957,6 +3957,11 @@ message MetricsEvent {
// OS: O
RUNNING_BACKGROUND_APPS_DIALOG = 944;
// FIELD - The delay from the start of the transition until we just call bindApplication on the
// client.
// OS: O
APP_TRANSITION_BIND_APPLICATION_DELAY_MS = 945;
// ---- End O Constants, all O constants go above this line ----
// Add new aosp constants above this line.

1
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -6845,6 +6845,7 @@ public class ActivityManagerService extends IActivityManager.Stub
}
checkTime(startTime, "attachApplicationLocked: immediately before bindApplication");
mStackSupervisor.mActivityMetricsLogger.notifyBindApplication(app);
if (app.instr != null) {
thread.bindApplication(processName, appInfo, providers,
app.instr.mClass,

24
services/core/java/com/android/server/am/ActivityMetricsLogger.java
View File

@@ -10,6 +10,7 @@ import static android.app.ActivityManager.StackId.INVALID_STACK_ID;
import static android.app.ActivityManager.StackId.PINNED_STACK_ID;
import static android.app.ActivityManagerInternal.APP_TRANSITION_TIMEOUT;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.APP_TRANSITION;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.APP_TRANSITION_BIND_APPLICATION_DELAY_MS;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.APP_TRANSITION_CALLING_PACKAGE_NAME;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.APP_TRANSITION_DELAY_MS;
import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.APP_TRANSITION_DEVICE_UPTIME_SECONDS;
@@ -78,7 +79,8 @@ class ActivityMetricsLogger {
private int startResult;
private boolean currentTransitionProcessRunning;
private int windowsDrawnDelayMs;
private int startingWindowDelayMs;
private int startingWindowDelayMs = -1;
private int bindApplicationDelayMs = -1;
private int reason = APP_TRANSITION_TIMEOUT;
private boolean loggedWindowsDrawn;
private boolean loggedStartingWindowDrawn;
@@ -296,6 +298,22 @@ class ActivityMetricsLogger {
}
}
/**
* Notifies the tracker that we called immediately before we call bindApplication on the client.
*
* @param app The client into which we'll call bindApplication.
*/
void notifyBindApplication(ProcessRecord app) {
for (int i = mStackTransitionInfo.size() - 1; i >= 0; i--) {
final StackTransitionInfo info = mStackTransitionInfo.valueAt(i);
// App isn't attached to record yet, so match with info.
if (info.launchedActivity.appInfo == app.info) {
info.bindApplicationDelayMs = calculateCurrentDelay();
}
}
}
private boolean allStacksWindowsDrawn() {
for (int index = mStackTransitionInfo.size() - 1; index >= 0; index--) {
if (!mStackTransitionInfo.valueAt(index).loggedWindowsDrawn) {
@@ -356,6 +374,10 @@ class ActivityMetricsLogger {
builder.addTaggedData(APP_TRANSITION_STARTING_WINDOW_DELAY_MS,
info.startingWindowDelayMs);
}
if (info.bindApplicationDelayMs != -1) {
builder.addTaggedData(APP_TRANSITION_BIND_APPLICATION_DELAY_MS,
info.bindApplicationDelayMs);
}
builder.addTaggedData(APP_TRANSITION_WINDOWS_DRAWN_DELAY_MS, info.windowsDrawnDelayMs);
mMetricsLogger.write(builder);
}