Merge "Merge "Always report a uid's initial cached state." into oc-mr1-dev am:... (27a4009d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -14984,7 +14984,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		} else if ("starter".equals(cmd)) {
		synchronized (this) {
		dumpActivityStarterLocked(pw);
		dumpActivityStarterLocked(pw, dumpPackage);
		}
		} else if ("recents".equals(cmd) \|\| "r".equals(cmd)) {
		synchronized (this) {
		@@ -15219,7 +15219,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		if (dumpAll) {
		pw.println("-------------------------------------------------------------------------------");
		}
		dumpActivityStarterLocked(pw);
		dumpActivityStarterLocked(pw, dumpPackage);
		pw.println();
		if (dumpAll) {
		pw.println("-------------------------------------------------------------------------------");
		@@ -15289,7 +15289,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		if (dumpAll) {
		pw.println("-------------------------------------------------------------------------------");
		}
		dumpActivityStarterLocked(pw);
		dumpActivityStarterLocked(pw, dumpPackage);
		pw.println();
		if (dumpAll) {
		pw.println("-------------------------------------------------------------------------------");
		@@ -15313,7 +15313,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		}

		private void dumpLastANRLocked(PrintWriter pw) {
		pw.println("ACTIVITY MANAGER ACTIVITIES (dumpsys activity lastanr)");
		pw.println("ACTIVITY MANAGER LAST ANR (dumpsys activity lastanr)");
		if (mLastANRState == null) {
		pw.println(" <no ANR has occurred since boot>");
		} else {
		@@ -15321,9 +15321,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		}

		private void dumpActivityStarterLocked(PrintWriter pw) {
		pw.println("ACTIVITY MANAGER ACTIVITIES (dumpsys activity starter)");
		mActivityStarter.dump(pw, "");
		private void dumpActivityStarterLocked(PrintWriter pw, String dumpPackage) {
		pw.println("ACTIVITY MANAGER STARTER (dumpsys activity starter)");
		mActivityStarter.dump(pw, "", dumpPackage);
		}

		void dumpActivitiesLocked(FileDescriptor fd, PrintWriter pw, String[] args,
		@@ -22825,11 +22825,11 @@ public class ActivityManagerService extends IActivityManager.Stub
		uidRec.lastBackgroundTime = 0;
		}
		final boolean wasCached = uidRec.setProcState
		> ActivityManager.PROCESS_STATE_RECEIVER && uidRec.setProcState
		!= ActivityManager.PROCESS_STATE_NONEXISTENT;
		> ActivityManager.PROCESS_STATE_RECEIVER;
		final boolean isCached = uidRec.curProcState
		> ActivityManager.PROCESS_STATE_RECEIVER;
		if (wasCached != isCached) {
		if (wasCached != isCached \|\|
		uidRec.setProcState == ActivityManager.PROCESS_STATE_NONEXISTENT) {
		uidChange \|= isCached ? UidRecord.CHANGE_CACHED : UidRecord.CHANGE_UNCACHED;
		}
		uidRec.setProcState = uidRec.curProcState;
		@@ -24090,7 +24090,7 @@ public class ActivityManagerService extends IActivityManager.Stub
		pw.println(" Reason: " + reason);
		}
		pw.println();
		mActivityStarter.dump(pw, " ");
		mActivityStarter.dump(pw, " ", null);
		pw.println();
		pw.println("-------------------------------------------------------------------------------");
		dumpActivitiesLocked(null /* fd /, pw, null / args /, 0 / opti */,

services/core/java/com/android/server/am/ActivityRecord.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -427,11 +427,11 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo
		pw.print("\"");
		pw.print(" primaryColor=");
		pw.println(Integer.toHexString(taskDescription.getPrimaryColor()));
		pw.print(prefix + " backgroundColor=");
		pw.print(prefix); pw.print(" backgroundColor=");
		pw.println(Integer.toHexString(taskDescription.getBackgroundColor()));
		pw.print(prefix + " statusBarColor=");
		pw.print(prefix); pw.print(" statusBarColor=");
		pw.println(Integer.toHexString(taskDescription.getStatusBarColor()));
		pw.print(prefix + " navigationBarColor=");
		pw.print(prefix); pw.print(" navigationBarColor=");
		pw.println(Integer.toHexString(taskDescription.getNavigationBarColor()));
		}
		if (iconFilename == null && taskDescription.getIcon() != null) {

services/core/java/com/android/server/am/ActivityStarter.java

+58 −22

Original line number	Diff line number	Diff line
		@@ -2310,40 +2310,76 @@ class ActivityStarter {
		return didSomething;
		}

		void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + "ActivityStarter:");
		void dump(PrintWriter pw, String prefix, String dumpPackage) {
		prefix = prefix + " ";

		pw.println(prefix + "mCurrentUser=" + mSupervisor.mCurrentUser);
		pw.println(prefix + "mLastStartReason=" + mLastStartReason);
		pw.println(prefix + "mLastStartActivityTimeMs="
		+ DateFormat.getDateTimeInstance().format(new Date(mLastStartActivityTimeMs)));
		pw.println(prefix + "mLastStartActivityResult=" + mLastStartActivityResult);
		if (dumpPackage != null) {
		if ((mLastStartActivityRecord[0] == null \|\|
		!dumpPackage.equals(mLastHomeActivityStartRecord[0].packageName)) &&
		(mLastHomeActivityStartRecord[0] == null \|\|
		!dumpPackage.equals(mLastHomeActivityStartRecord[0].packageName)) &&
		(mStartActivity == null \|\| !dumpPackage.equals(mStartActivity.packageName))) {
		pw.print(prefix);
		pw.println("(nothing)");
		return;
		}
		}

		pw.print(prefix);
		pw.print("mCurrentUser=");
		pw.println(mSupervisor.mCurrentUser);
		pw.print(prefix);
		pw.print("mLastStartReason=");
		pw.println(mLastStartReason);
		pw.print(prefix);
		pw.print("mLastStartActivityTimeMs=");
		pw.println(DateFormat.getDateTimeInstance().format(new Date(mLastStartActivityTimeMs)));
		pw.print(prefix);
		pw.print("mLastStartActivityResult=");
		pw.println(mLastStartActivityResult);
		ActivityRecord r = mLastStartActivityRecord[0];
		if (r != null) {
		pw.println(prefix + "mLastStartActivityRecord:");
		pw.print(prefix);
		pw.println("mLastStartActivityRecord:");
		r.dump(pw, prefix + " ");
		}
		pw.println(prefix + "mLastHomeActivityStartResult=" + mLastHomeActivityStartResult);
		pw.print(prefix);
		pw.print("mLastHomeActivityStartResult=");
		pw.println(mLastHomeActivityStartResult);
		r = mLastHomeActivityStartRecord[0];
		if (r != null) {
		pw.println(prefix + "mLastHomeActivityStartRecord:");
		pw.print(prefix);
		pw.println("mLastHomeActivityStartRecord:");
		r.dump(pw, prefix + " ");
		}
		if (mStartActivity != null) {
		pw.println(prefix + "mStartActivity:");
		pw.print(prefix);
		pw.println("mStartActivity:");
		mStartActivity.dump(pw, prefix + " ");
		}
		if (mIntent != null) {
		pw.println(prefix + "mIntent=" + mIntent);
		pw.print(prefix);
		pw.print("mIntent=");
		pw.println(mIntent);
		}
		if (mOptions != null) {
		pw.println(prefix + "mOptions=" + mOptions);
		}
		pw.println(prefix + "mLaunchSingleTop=" + mLaunchSingleTop
		+ " mLaunchSingleInstance=" + mLaunchSingleInstance
		+ " mLaunchSingleTask=" + mLaunchSingleTask
		+ " mLaunchFlags=0x" + Integer.toHexString(mLaunchFlags)
		+ " mDoResume=" + mDoResume + " mAddingToTask=" + mAddingToTask);
		pw.print(prefix);
		pw.print("mOptions=");
		pw.println(mOptions);
		}
		pw.print(prefix);
		pw.print("mLaunchSingleTop=");
		pw.print(mLaunchSingleTop);
		pw.print(" mLaunchSingleInstance=");
		pw.print(mLaunchSingleInstance);
		pw.print(" mLaunchSingleTask=");
		pw.println(mLaunchSingleTask);
		pw.print(prefix);
		pw.print("mLaunchFlags=0x");
		pw.print(Integer.toHexString(mLaunchFlags));
		pw.print(" mDoResume=");
		pw.print(mDoResume);
		pw.print(" mAddingToTask=");
		pw.println(mAddingToTask);
		}
		}