diff options
| author | 2017-06-23 02:10:32 +0000 | |
|---|---|---|
| committer | 2017-06-23 02:10:38 +0000 | |
| commit | b55b842898e8b6e7768280ee0f278e4e158cc772 (patch) | |
| tree | 9e97c5fc6bf87c2e958337b968d27647ee30b961 | |
| parent | 2ef19c1d73f89ca4718b5a8f0c2e7221621e844f (diff) | |
| parent | 454117fe071e262328c72e73ef432a33da7e1a12 (diff) | |
Merge "Dump user id in dumpsys activity starter" into oc-dev
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityStarter.java | 1 |
2 files changed, 6 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 6c3a8a48656d..607b84c4658e 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4064,7 +4064,11 @@ public class ActivityManagerService extends IActivityManager.Stub aInfo.applicationInfo.uid, true); if (app == null || app.instr == null) { intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK); - mActivityStarter.startHomeActivityLocked(intent, aInfo, reason); + final int resolvedUserId = UserHandle.getUserId(aInfo.applicationInfo.uid); + // For ANR debugging to verify if the user activity is the one that actually + // launched. + final String myReason = reason + ":" + userId + ":" + resolvedUserId; + mActivityStarter.startHomeActivityLocked(intent, aInfo, myReason); } } else { Slog.wtf(TAG, "No home screen found for " + intent, new Throwable()); diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index be30d5aaeab9..a145435976fa 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -2308,6 +2308,7 @@ class ActivityStarter { pw.println(prefix + "ActivityStarter:"); prefix = prefix + " "; + pw.println(prefix + "mCurrentUser=" + mSupervisor.mCurrentUser); pw.println(prefix + "mLastStartReason=" + mLastStartReason); pw.println(prefix + "mLastStartActivityTimeMs=" + DateFormat.getDateTimeInstance().format(new Date(mLastStartActivityTimeMs))); |