Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Thread] define Thread hardware feature" into main am: 12e71635e8 am: 1023632c88

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

Change-Id: I8430fced50ca10f6a270fe347552cb2551deb970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kangping Dong
2023-07-25 12:42:45 +00:00
committed by Automerger Merge Worker
parent e99755995c 1023632c88
commit 0414c91c03
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -12736,6 +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_RADIO_ACCESS = "android.hardware.telephony.radio.access";
field public static final String FEATURE_TELEPHONY_SUBSCRIPTION = "android.hardware.telephony.subscription"; 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 @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_TOUCHSCREEN = "android.hardware.touchscreen"; 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 = "android.hardware.touchscreen.multitouch";
field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct"; field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";

8
core/java/android/content/pm/PackageManager.java
View File

@@ -3597,6 +3597,14 @@ public abstract class PackageManager {
public static final String FEATURE_TELEPHONY_SUBSCRIPTION = public static final String FEATURE_TELEPHONY_SUBSCRIPTION =
"android.hardware.telephony.subscription"; "android.hardware.telephony.subscription";
/**
* Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device is capable of communicating with
* other devices via Thread network.
*/
@SdkConstant(SdkConstantType.FEATURE)
public static final String FEATURE_THREADNETWORK = "android.hardware.threadnetwork";
/** /**
* Feature for {@link #getSystemAvailableFeatures} and * Feature for {@link #getSystemAvailableFeatures} and
* {@link #hasSystemFeature}: The device is capable of communicating with * {@link #hasSystemFeature}: The device is capable of communicating with