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

Commit f2b74228 authored Apr 13, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Apr 13, 2022

Merge changes from topic "presubmit-am-d2fb8e1cab9f469d997bbe6f898c6870" into...

Merge changes from topic "presubmit-am-d2fb8e1cab9f469d997bbe6f898c6870" into tm-mainline-prod am: a439a9a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17668627

Change-Id: Iac5a0f75eeb85118023a9e99537aac4f12d3085e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 9aa70482 a439a9a9

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -52055,7 +52055,6 @@ package android.view.accessibility {
		method public boolean isSelected();
		method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean);
		method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean, boolean);
		method @Deprecated @NonNull public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(@Nullable String, int, int, @Nullable String, int, int, boolean, boolean);
		}

		public static final class AccessibilityNodeInfo.CollectionItemInfo.Builder {

core/api/removed.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -525,6 +525,14 @@ package android.view {

		}

		package android.view.accessibility {

		public static final class AccessibilityNodeInfo.CollectionItemInfo {
		method @Deprecated @NonNull public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(@Nullable String, int, int, @Nullable String, int, int, boolean, boolean);
		}

		}

		package android.view.translation {

		public final class TranslationManager {

core/java/android/view/accessibility/AccessibilityNodeInfo.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -5688,6 +5688,7 @@ public class AccessibilityNodeInfo implements Parcelable {
		* @param heading Whether the item is a heading. (Prefer
		* {@link AccessibilityNodeInfo#setHeading(boolean)})
		* @param selected Whether the item is selected.
		* @removed
		*/
		@Deprecated
		@NonNull

tools/apilint/deprecated_at_birth.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,7 @@ def ident(raw):
		can be used to identify members across API levels."""
		raw = raw.replace(" deprecated ", " ")
		raw = raw.replace(" synchronized ", " ")
		raw = raw.replace(" abstract ", " ")
		raw = raw.replace(" final ", " ")
		raw = re.sub("<.+?>", "", raw)
		raw = re.sub("@[A-Za-z]+ ", "", raw)