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

Merge "Dump user id in dumpsys activity starter" into oc-dev

Browse Source 
am: b55b842898

Change-Id: I5b73df5e46d26d2008dba7a34345a0c37c099514
This commit is contained in:
Wale Ogunwale
2017-06-23 02:19:26 +00:00
committed by android-build-merger
parent 472b4c834f b55b842898
commit e30da86a46
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4064,7 +4064,11 @@ public class ActivityManagerService extends IActivityManager.Stub
aInfo.applicationInfo.uid, true); aInfo.applicationInfo.uid, true);
if (app == null || app.instr == null) { if (app == null || app.instr == null) {
intent.setFlags(intent.getFlags() | Intent.FLAG_ACTIVITY_NEW_TASK); 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 { } else {
Slog.wtf(TAG, "No home screen found for " + intent, new Throwable()); Slog.wtf(TAG, "No home screen found for " + intent, new Throwable());

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

@@ -2308,6 +2308,7 @@ class ActivityStarter {
pw.println(prefix + "ActivityStarter:"); pw.println(prefix + "ActivityStarter:");
prefix = prefix + " "; prefix = prefix + " ";
pw.println(prefix + "mCurrentUser=" + mSupervisor.mCurrentUser);
pw.println(prefix + "mLastStartReason=" + mLastStartReason); pw.println(prefix + "mLastStartReason=" + mLastStartReason);
pw.println(prefix + "mLastStartActivityTimeMs=" pw.println(prefix + "mLastStartActivityTimeMs="
+ DateFormat.getDateTimeInstance().format(new Date(mLastStartActivityTimeMs))); + DateFormat.getDateTimeInstance().format(new Date(mLastStartActivityTimeMs)));