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

Commit c39fe8cd authored Aug 11, 2023 by Kangping Dong Committed by Automerger Merge Worker Aug 11, 2023

Merge "[Thread] rename FEATURE_THREADNETWORK to FEATURE_THREAD_NETWORK" into...

Merge "[Thread] rename FEATURE_THREADNETWORK to FEATURE_THREAD_NETWORK" into main am: a3ad41ea am: d1f4348e am: e2e419c4

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

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

parents 5d5682d7 e2e419c4

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -12736,7 +12736,7 @@ package android.content.pm {
		field public static final String FEATURE_TELEPHONY_RADIO_ACCESS = "android.hardware.telephony.radio.access";
		field public static final String FEATURE_TELEPHONY_SUBSCRIPTION = "android.hardware.telephony.subscription";
		field @Deprecated public static final String FEATURE_TELEVISION = "android.hardware.type.television";
		field public static final String FEATURE_THREADNETWORK = "android.hardware.threadnetwork";
		field public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";
		field public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";
		field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";
		field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";

core/java/android/content/pm/PackageManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -3634,12 +3634,12 @@ public abstract class PackageManager {
		"android.hardware.telephony.subscription";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and
		* {@link #hasSystemFeature}: The device is capable of communicating with
		* other devices via Thread network.
		* Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
		* The device is capable of communicating with other devices via
		* <a href="https://www.threadgroup.org">Thread</a> networking protocol.
		*/
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_THREADNETWORK = "android.hardware.threadnetwork";
		public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";

		/**
		* Feature for {@link #getSystemAvailableFeatures} and