diff options
| author | 2023-07-25 12:02:56 +0000 | |
|---|---|---|
| committer | 2023-07-25 12:02:56 +0000 | |
| commit | 1023632c88941ad5efbc4a3a5e24a27fe93e0c29 (patch) | |
| tree | e700dec87096ac18080b5864a8f9ddc58ffef4ce | |
| parent | b6c6ce7ee6bd1a0fed535f72fd6d0e998f5b0bf9 (diff) | |
| parent | 12e71635e878b5152291e5812378c137c2a35865 (diff) | |
Merge "[Thread] define Thread hardware feature" into main am: 12e71635e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2605725
Change-Id: I4b2a77d5502de790331cc06b7d70571c782362f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 44865b54089d..abf3a2f0ddf8 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -12037,6 +12037,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_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"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 4677026a7230..d738d9eec4cb 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3448,6 +3448,14 @@ public abstract class PackageManager { /** * 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 + * {@link #hasSystemFeature}: The device is capable of communicating with * other devices via ultra wideband. */ @SdkConstant(SdkConstantType.FEATURE) |