diff options
| author | Craig Mautner <cmautner@google.com> | 2015-01-23 16:38:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-23 16:38:20 +0000 |
| commit | 3fbe92e1ab873099005c75185bf84fd8a8300da4 (patch) | |
| tree | 9297b7f1e1d6ad37e94bfa943246cea5c9ead56e /services | |
| parent | c8423a5f237f1ca75c7be7c0373268b918f2a416 (diff) | |
| parent | dbabf37fd3a6b70be5cf9639f11656e12601154d (diff) | |
| download | frameworks_base-3fbe92e1ab873099005c75185bf84fd8a8300da4.zip frameworks_base-3fbe92e1ab873099005c75185bf84fd8a8300da4.tar.gz frameworks_base-3fbe92e1ab873099005c75185bf84fd8a8300da4.tar.bz2 | |
am dbabf37f: Merge "Even more debug for bug 17721767." into lmp-mr1-dev
* commit 'dbabf37fd3a6b70be5cf9639f11656e12601154d':
Even more debug for bug 17721767.
Diffstat (limited to 'services')
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 1ddb2ce..40bcf8e 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 b81df9e..5c8e191 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 d3cc56b..41499be 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) |