summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityManagerService.java2
-rw-r--r--services/core/java/com/android/server/am/ActivityStackSupervisor.java6
-rw-r--r--services/core/java/com/android/server/am/EventLogTags.logtags6
3 files changed, 13 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 1ddb2cee6fea..40bcf8edd4c7 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -2373,6 +2373,8 @@ public final class ActivityManagerService extends ActivityManagerNative
}
applyUpdateLockStateLocked(r);
}
+ EventLog.writeEvent(EventLogTags.AM_FOCUSED_ACTIVITY, mCurrentUserId,
+ mFocusedActivity == null ? "NULL" : mFocusedActivity.shortComponentName);
}
final void clearFocusedActivity(ActivityRecord r) {
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index b81df9e7338e..5c8e19137705 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -400,7 +400,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
void moveHomeStack(boolean toFront) {
ArrayList<ActivityStack> stacks = mHomeStack.mStacks;
- int topNdx = stacks.size() - 1;
+ final int topNdx = stacks.size() - 1;
if (topNdx <= 0) {
return;
}
@@ -414,6 +414,10 @@ public final class ActivityStackSupervisor implements DisplayListener {
if (DEBUG_STACK) Slog.d(TAG, "moveHomeTask: topStack old=" + topStack + " new="
+ mFocusedStack);
}
+ EventLog.writeEvent(EventLogTags.AM_HOME_STACK_MOVED,
+ mCurrentUser, toFront ? 1 : 0, stacks.get(topNdx).getStackId(),
+ mFocusedStack == null ? -1 : mFocusedStack.getStackId());
+
if (mService.mBooting || !mService.mBooted) {
final ActivityRecord r = topRunningActivityLocked();
if (r != null && r.idle) {
diff --git a/services/core/java/com/android/server/am/EventLogTags.logtags b/services/core/java/com/android/server/am/EventLogTags.logtags
index d3cc56b53028..41499bee3989 100644
--- a/services/core/java/com/android/server/am/EventLogTags.logtags
+++ b/services/core/java/com/android/server/am/EventLogTags.logtags
@@ -89,3 +89,9 @@ option java_package com.android.server.am
# Activity fully drawn time
30042 am_activity_fully_drawn_time (User|1|5),(Token|1|5),(Component Name|3),(time|2|3)
+
+# Activity focused
+30043 am_focused_activity (User|1|5),(Component Name|3)
+
+# Home Stack brought to front or rear
+30044 am_home_stack_moved (User|1|5),(To Front|1|5),(Top Stack Id|1|5),(Focused Stack Id|1|5)