Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b91082d8 authored Jan 23, 2018 by TreeHugger Robot Committed by Android (Google) Code Review Jan 23, 2018

Merge "Add temporary logging around Activity Manager NPE."

parents 64631596 77a7dd6b

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -676,6 +676,15 @@ class ActivityDisplay extends ConfigurationContainer<ActivityStack> {
		}
		}

		public void dumpStacks(PrintWriter pw) {
		for (int i = mStacks.size() - 1; i >= 0; --i) {
		pw.print(mStacks.get(i).mStackId);
		if (i > 0) {
		pw.print(",");
		}
		}
		}

		public void writeToProto(ProtoOutputStream proto, long fieldId) {
		final long token = proto.start(fieldId);
		super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -21482,6 +21482,17 @@ public class ActivityManagerService extends IActivityManager.Stub
		private void resizeStackWithBoundsFromWindowManager(int stackId, boolean deferResume) {
		final Rect newStackBounds = new Rect();
		final ActivityStack stack = mStackSupervisor.getStack(stackId);

		// TODO(b/71548119): Revert CL introducing below once cause of mismatch is found.
		if (stack == null) {
		final StringWriter writer = new StringWriter();
		final PrintWriter printWriter = new PrintWriter(writer);
		mStackSupervisor.dumpDisplays(printWriter);
		printWriter.flush();

		Log.wtf(TAG, "stack not found:" + stackId + " displays:" + writer);
		}

		stack.getBoundsForNewConfiguration(newStackBounds);
		mStackSupervisor.resizeStackLocked(
		stack, !newStackBounds.isEmpty() ? newStackBounds : null /* bounds */,

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -3752,6 +3752,15 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D
		}
		}

		public void dumpDisplays(PrintWriter pw) {
		for (int i = mActivityDisplays.size() - 1; i >= 0; --i) {
		final ActivityDisplay display = mActivityDisplays.valueAt(i);
		pw.print("[id:" + display.mDisplayId + " stacks:");
		display.dumpStacks(pw);
		pw.print("]");
		}
		}

		public void dump(PrintWriter pw, String prefix) {
		pw.print(prefix); pw.print("mFocusedStack=" + mFocusedStack);
		pw.print(" mLastFocusedStack="); pw.println(mLastFocusedStack);