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

Merge "Even more debug for bug 17721767." into lmp-mr1-dev

Browse Source 
automerge: dbabf37

* commit 'dbabf37fd3a6b70be5cf9639f11656e12601154d':
  Even more debug for bug 17721767.
This commit is contained in:
Craig Mautner
2015-01-22 23:24:11 +00:00
committed by android-build-merger
parent abbf8d4194 dbabf37fd3
commit 5cb31f2179
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2373,6 +2373,8 @@ public final class ActivityManagerService extends ActivityManagerNative
} }
applyUpdateLockStateLocked(r); applyUpdateLockStateLocked(r);
} }
EventLog.writeEvent(EventLogTags.AM_FOCUSED_ACTIVITY, mCurrentUserId,
mFocusedActivity == null ? "NULL" : mFocusedActivity.shortComponentName);
} }
final void clearFocusedActivity(ActivityRecord r) { final void clearFocusedActivity(ActivityRecord r) {

6
services/core/java/com/android/server/am/ActivityStackSupervisor.java
View File

@@ -400,7 +400,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
void moveHomeStack(boolean toFront) { void moveHomeStack(boolean toFront) {
ArrayList<ActivityStack> stacks = mHomeStack.mStacks; ArrayList<ActivityStack> stacks = mHomeStack.mStacks;
int topNdx = stacks.size() - 1; final int topNdx = stacks.size() - 1;
if (topNdx <= 0) { if (topNdx <= 0) {
return; return;
} }
@@ -414,6 +414,10 @@ public final class ActivityStackSupervisor implements DisplayListener {
if (DEBUG_STACK) Slog.d(TAG, "moveHomeTask: topStack old=" + topStack + " new=" if (DEBUG_STACK) Slog.d(TAG, "moveHomeTask: topStack old=" + topStack + " new="
+ mFocusedStack); + 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) { if (mService.mBooting || !mService.mBooted) {
final ActivityRecord r = topRunningActivityLocked(); final ActivityRecord r = topRunningActivityLocked();
if (r != null && r.idle) { if (r != null && r.idle) {

6
services/core/java/com/android/server/am/EventLogTags.logtags
View File

@@ -89,3 +89,9 @@ option java_package com.android.server.am
# Activity fully drawn time # Activity fully drawn time
30042 am_activity_fully_drawn_time (User|1|5),(Token|1|5),(Component Name|3),(time|2|3) 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)