Merge "Improved AutofillManager and Activity dump() methods:" (ef734b29) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+11 −3

Original line number	Diff line number	Diff line
		@@ -6382,6 +6382,10 @@ public class Activity extends ContextThemeWrapper
		}

		void dumpInner(String prefix, FileDescriptor fd, PrintWriter writer, String[] args) {
		if (args != null && args.length > 0 && args[0].equals("--autofill")) {
		dumpAutofillManager(prefix, writer);
		return;
		}
		writer.print(prefix); writer.print("Local Activity ");
		writer.print(Integer.toHexString(System.identityHashCode(this)));
		writer.println(" State:");
		@@ -6409,16 +6413,20 @@ public class Activity extends ContextThemeWrapper

		mHandler.getLooper().dump(new PrintWriterPrinter(writer), prefix);

		dumpAutofillManager(prefix, writer);

		ResourcesManager.getInstance().dump(prefix, writer);
		}

		void dumpAutofillManager(String prefix, PrintWriter writer) {
		final AutofillManager afm = getAutofillManager();
		if (afm != null) {
		afm.dump(prefix, writer);
		writer.print(prefix); writer.print("Autofill Compat Mode: ");
		writer.println(isAutofillCompatibilityEnabled());
		afm.dump(prefix, writer);
		} else {
		writer.print(prefix); writer.println("No AutofillManager");
		}

		ResourcesManager.getInstance().dump(prefix, writer);
		}

		/**

core/java/android/view/autofill/AutofillManager.java

+23 −3

Original line number	Diff line number	Diff line
		@@ -2152,7 +2152,11 @@ public final class AutofillManager {
		pw.print(pfx); pw.print("sessionId: "); pw.println(mSessionId);
		pw.print(pfx); pw.print("state: "); pw.println(getStateAsStringLocked());
		pw.print(pfx); pw.print("context: "); pw.println(mContext);
		pw.print(pfx); pw.print("client: "); pw.println(getClient());
		final AutofillClient client = getClient();
		if (client != null) {
		pw.print(pfx); pw.print("client: "); pw.print(client);
		pw.print(" ("); pw.print(client.autofillClientGetActivityToken()); pw.println(')');
		}
		pw.print(pfx); pw.print("enabled: "); pw.println(mEnabled);
		pw.print(pfx); pw.print("hasService: "); pw.println(mService != null);
		pw.print(pfx); pw.print("hasCallback: "); pw.println(mCallback != null);
		@@ -2172,8 +2176,24 @@ public final class AutofillManager {
		pw.print(pfx); pw.print("entered ids: "); pw.println(mEnteredIds);
		pw.print(pfx); pw.print("save trigger id: "); pw.println(mSaveTriggerId);
		pw.print(pfx); pw.print("save on finish(): "); pw.println(mSaveOnFinish);
		pw.print(pfx); pw.print("compat mode enabled: "); pw.println(
		isCompatibilityModeEnabledLocked());
		pw.print(pfx); pw.print("compat mode enabled: ");
		synchronized (mLock) {
		if (mCompatibilityBridge != null) {
		final String pfx2 = pfx + " ";
		pw.println("true");
		pw.print(pfx2); pw.print("windowId: ");
		pw.println(mCompatibilityBridge.mFocusedWindowId);
		pw.print(pfx2); pw.print("nodeId: ");
		pw.println(mCompatibilityBridge.mFocusedNodeId);
		pw.print(pfx2); pw.print("virtualId: ");
		pw.println(AccessibilityNodeInfo
		.getVirtualDescendantId(mCompatibilityBridge.mFocusedNodeId));
		pw.print(pfx2); pw.print("focusedBounds: ");
		pw.println(mCompatibilityBridge.mFocusedBounds);
		} else {
		pw.println("false");
		}
		}
		pw.print(pfx); pw.print("debug: "); pw.print(sDebug);
		pw.print(" verbose: "); pw.println(sVerbose);
		}

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -16,6 +16,14 @@

		package com.android.server.am;

		import static android.app.ActivityTaskManager.RESIZE_MODE_SYSTEM;
		import static android.app.ActivityTaskManager.RESIZE_MODE_USER;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
		import static android.view.Display.INVALID_DISPLAY;

		import static com.android.server.am.TaskRecord.INVALID_TASK_ID;

		import android.app.ActivityManager;
		import android.app.ActivityOptions;
		import android.app.ActivityTaskManager;
		@@ -102,15 +110,6 @@ import javax.microedition.khronos.egl.EGLContext;
		import javax.microedition.khronos.egl.EGLDisplay;
		import javax.microedition.khronos.egl.EGLSurface;

		import static android.app.ActivityTaskManager.RESIZE_MODE_SYSTEM;
		import static android.app.ActivityTaskManager.RESIZE_MODE_USER;
		import static android.app.ActivityTaskManager.INVALID_STACK_ID;
		import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
		import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
		import static android.view.Display.INVALID_DISPLAY;

		import static com.android.server.am.TaskRecord.INVALID_TASK_ID;

		final class ActivityManagerShellCommand extends ShellCommand {
		public static final String NO_CLASS_ERROR_CODE = "Error type 3";
		private static final String SHELL_PACKAGE_NAME = "com.android.shell";
		@@ -2850,6 +2849,7 @@ final class ActivityManagerShellCommand extends ShellCommand {
		pw.println(" --checkin: output checkin format, resetting data.");
		pw.println(" --C: output checkin format, not resetting data.");
		pw.println(" --proto: output dump in protocol buffer format.");
		pw.println(" --autofill: dump just the autofill-related state of an activity");
		} else {
		pw.println("Activity manager (activity) commands:");
		pw.println(" help");