Merge "Safe delete the deprecated APIs." into sc-dev (afe90e57) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -14287,13 +14287,9 @@ package android.view.translation {
		}

		public final class UiTranslationManager {
		method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void finishTranslation(int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void finishTranslation(@NonNull android.app.assist.ActivityId);
		method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void pauseTranslation(int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void pauseTranslation(@NonNull android.app.assist.ActivityId);
		method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void resumeTranslation(int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void resumeTranslation(@NonNull android.app.assist.ActivityId);
		method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void startTranslation(@NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec, @NonNull java.util.List<android.view.autofill.AutofillId>, int);
		method @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void startTranslation(@NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec, @NonNull java.util.List<android.view.autofill.AutofillId>, @NonNull android.app.assist.ActivityId);
		}

core/api/system-removed.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -181,3 +181,14 @@ package android.telephony.data {

		}

		package android.view.translation {

		public final class UiTranslationManager {
		method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void finishTranslation(int);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void pauseTranslation(int);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void resumeTranslation(int);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION) public void startTranslation(@NonNull android.view.translation.TranslationSpec, @NonNull android.view.translation.TranslationSpec, @NonNull java.util.List<android.view.autofill.AutofillId>, int);
		}

		}

core/java/android/view/translation/UiTranslationManager.java

+14 −4

Original line number	Diff line number	Diff line
		@@ -127,10 +127,13 @@ public final class UiTranslationManager {
		* @param destSpec {@link TranslationSpec} for the translated data.
		* @param viewIds A list of the {@link View}'s {@link AutofillId} which needs to be translated
		* @param taskId the Activity Task id which needs ui translation
		* @deprecated Use {@code startTranslation(TranslationSpec, TranslationSpec, List<AutofillId>,
		* ActivityId)} instead.
		*
		* @hide
		* @removed
		*/
		// TODO, hide the APIs
		@Deprecated
		@RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
		@SystemApi
		public void startTranslation(@NonNull TranslationSpec sourceSpec,
		@@ -193,10 +196,13 @@ public final class UiTranslationManager {
		* NOTE: Please use {@code finishTranslation(ActivityId)} instead.
		*
		* @param taskId the Activity Task id which needs ui translation
		* @deprecated Use {@code finishTranslation(ActivityId)} instead.
		*
		* @hide
		* @removed
		*
		*/
		// TODO, hide the APIs
		@Deprecated
		@RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
		@SystemApi
		public void finishTranslation(int taskId) {
		@@ -240,10 +246,12 @@ public final class UiTranslationManager {
		* NOTE: Please use {@code pauseTranslation(ActivityId)} instead.
		*
		* @param taskId the Activity Task id which needs ui translation
		* @deprecated Use {@code pauseTranslation(ActivityId)} instead.
		*
		* @hide
		* @removed
		*/
		// TODO, hide the APIs
		@Deprecated
		@RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
		@SystemApi
		public void pauseTranslation(int taskId) {
		@@ -287,10 +295,12 @@ public final class UiTranslationManager {
		* NOTE: Please use {@code resumeTranslation(ActivityId)} instead.
		*
		* @param taskId the Activity Task id which needs ui translation
		* @deprecated Use {@code resumeTranslation(ActivityId)} instead.
		*
		* @hide
		* @removed
		*/
		// TODO, hide the APIs
		@Deprecated
		@RequiresPermission(android.Manifest.permission.MANAGE_UI_TRANSLATION)
		@SystemApi
		public void resumeTranslation(int taskId) {