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

Commit 8a585968 authored Oct 25, 2023 by Kangping Dong Committed by Automerger Merge Worker Oct 25, 2023

Merge "[Thread] flagging the FEATURE_THREAD_NETWORK API" into main am:...

Merge "[Thread] flagging the FEATURE_THREAD_NETWORK API" into main am: e4c42b34 am: d5554ffe am: 7819abd9

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

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

parents 0c1172f9 7819abd9

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -12889,7 +12889,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_THREAD_NETWORK = "android.hardware.thread_network";
		field @FlaggedApi("com.android.net.thread.flags.thread_enabled") 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

+1 −0

Original line number	Diff line number	Diff line
		@@ -3778,6 +3778,7 @@ public abstract class PackageManager {
		* The device is capable of communicating with other devices via
		* <a href="https://www.threadgroup.org">Thread</a> networking protocol.
		*/
		@FlaggedApi("com.android.net.thread.flags.thread_enabled")
		@SdkConstant(SdkConstantType.FEATURE)
		public static final String FEATURE_THREAD_NETWORK = "android.hardware.thread_network";