Merge "Deprecated "legacy" options for Activity.dump()" (bb1bb44c) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+3 −0

core/java/android/app/Activity.java

+29 −32

Original line number	Original line	Diff line number	Diff line
	@@ -814,6 +814,13 @@ public class Activity extends ContextThemeWrapper
	Dialog mDialog;		Dialog mDialog;
	Bundle mArgs;		Bundle mArgs;
	}		}

			/** @hide */ public static final String DUMP_ARG_AUTOFILL = "--autofill";
			/** @hide */ public static final String DUMP_ARG_CONTENT_CAPTURE = "--contentcapture";
			/** @hide */ public static final String DUMP_ARG_TRANSLATION = "--translation";
			/** @hide */ @TestApi public static final String DUMP_ARG_LIST_DUMPABLES = "--list-dumpables";
			/** @hide */ @TestApi public static final String DUMP_ARG_DUMP_DUMPABLE = "--dump-dumpable";

	private SparseArray<ManagedDialog> mManagedDialogs;		private SparseArray<ManagedDialog> mManagedDialogs;

	// set by the thread after the constructor and before onCreate(Bundle savedInstanceState) is called.		// set by the thread after the constructor and before onCreate(Bundle savedInstanceState) is called.
	@@ -7367,25 +7374,30 @@ public class Activity extends ContextThemeWrapper
	boolean isSpecialCase = true;		boolean isSpecialCase = true;
	// Handle special cases		// Handle special cases
	switch (arg) {		switch (arg) {
	case "--autofill":		case DUMP_ARG_AUTOFILL:
	dumpAutofillManager(prefix, writer, args);		dumpLegacyDumpable(prefix, writer, arg,
	break;		AutofillClientController.DUMPABLE_NAME);
	case "--contentcapture":		return;
	dumpContentCaptureManager(prefix, writer);		case DUMP_ARG_CONTENT_CAPTURE:
	break;		dumpLegacyDumpable(prefix, writer, arg,
	case "--translation":		ContentCaptureManager.DUMPABLE_NAME);
	dumpUiTranslation(prefix, writer);		return;
	break;		case DUMP_ARG_TRANSLATION:
	case "--list-dumpables":		dumpLegacyDumpable(prefix, writer, arg,
			UiTranslationController.DUMPABLE_NAME);
			return;
			case DUMP_ARG_LIST_DUMPABLES:
	if (mDumpableContainer == null) {		if (mDumpableContainer == null) {
	writer.print(prefix); writer.println("No dumpables");		writer.print(prefix); writer.println("No dumpables");
	} else {		} else {
	mDumpableContainer.listDumpables(prefix, writer);		mDumpableContainer.listDumpables(prefix, writer);
	}		}
	break;		mDumpableContainer.listDumpables(prefix, writer);
	case "--dump-dumpable":		return;
			case DUMP_ARG_DUMP_DUMPABLE:
	if (args.length == 1) {		if (args.length == 1) {
	writer.println("--dump-dumpable requires the dumpable name");		writer.print(DUMP_ARG_DUMP_DUMPABLE);
			writer.println(" requires the dumpable name");
	} else if (mDumpableContainer == null) {		} else if (mDumpableContainer == null) {
	writer.println("no dumpables");		writer.println("no dumpables");
	} else {		} else {
	@@ -7452,25 +7464,10 @@ public class Activity extends ContextThemeWrapper
	}		}
	}		}

	private void dumpContentCaptureManager(String prefix, PrintWriter writer) {		private void dumpLegacyDumpable(String prefix, PrintWriter writer, String legacyOption,
	dumpLegacyDumpable(prefix, writer, ContentCaptureManager.DUMPABLE_NAME, /* args= */ null);		String dumpableName) {
	}		writer.printf("%s%s option deprecated. Use %s %s instead\n", prefix, legacyOption,
			DUMP_ARG_DUMP_DUMPABLE, dumpableName);
	private void dumpUiTranslation(String prefix, PrintWriter writer) {
	dumpLegacyDumpable(prefix, writer, UiTranslationController.DUMPABLE_NAME, /* args= */ null);
	}

	private void dumpAutofillManager(String prefix, PrintWriter writer, String[] args) {
	dumpLegacyDumpable(prefix, writer, AutofillClientController.DUMPABLE_NAME, args);
	}

	private void dumpLegacyDumpable(@NonNull String prefix, @NonNull PrintWriter writer,
	@NonNull String dumpableName, @Nullable String[] args) {
	if (mDumpableContainer == null) {
	writer.print(prefix); writer.print("no "); writer.println(dumpableName);
	return;
	}
	mDumpableContainer.dumpOneDumpable(prefix, writer, dumpableName, args);
	}		}

	/**		/**

core/java/android/view/contentcapture/ContentCaptureManager.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -218,6 +218,7 @@ public final class ContentCaptureManager {
	public static final boolean DEBUG = false;		public static final boolean DEBUG = false;

	/** @hide */		/** @hide */
			@TestApi
	public static final String DUMPABLE_NAME = "ContentCaptureManager";		public static final String DUMPABLE_NAME = "ContentCaptureManager";

	/** Error happened during the data sharing session. */		/** Error happened during the data sharing session. */

services/translation/java/com/android/server/translation/TranslationManagerServiceImpl.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@ import static android.view.translation.UiTranslationManager.STATE_UI_TRANSLATION

	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
			import android.app.Activity;
	import android.content.ComponentName;		import android.content.ComponentName;
	import android.content.Context;		import android.content.Context;
	import android.content.pm.PackageManager;		import android.content.pm.PackageManager;
	@@ -43,6 +44,7 @@ import android.view.translation.ITranslationServiceCallback;
	import android.view.translation.TranslationCapability;		import android.view.translation.TranslationCapability;
	import android.view.translation.TranslationContext;		import android.view.translation.TranslationContext;
	import android.view.translation.TranslationSpec;		import android.view.translation.TranslationSpec;
			import android.view.translation.UiTranslationController;
	import android.view.translation.UiTranslationManager.UiTranslationState;		import android.view.translation.UiTranslationManager.UiTranslationState;
	import android.view.translation.UiTranslationSpec;		import android.view.translation.UiTranslationSpec;

	@@ -253,7 +255,10 @@ final class TranslationManagerServiceImpl extends
	try (TransferPipe tp = new TransferPipe()) {		try (TransferPipe tp = new TransferPipe()) {
	activityTokens.getApplicationThread().dumpActivity(tp.getWriteFd(),		activityTokens.getApplicationThread().dumpActivity(tp.getWriteFd(),
	activityTokens.getActivityToken(), prefix,		activityTokens.getActivityToken(), prefix,
	new String[]{"--translation"});		new String[] {
			Activity.DUMP_ARG_DUMP_DUMPABLE,
			UiTranslationController.DUMPABLE_NAME
			});
	tp.go(fd);		tp.go(fd);
	} catch (IOException e) {		} catch (IOException e) {
	pw.println(prefix + "Failure while dumping the activity: " + e);		pw.println(prefix + "Failure while dumping the activity: " + e);