diff options
| author | 2023-07-25 14:10:44 +0000 | |
|---|---|---|
| committer | 2023-07-25 14:10:44 +0000 | |
| commit | b62f60711e1bbe35d5d3afa43f4d770b9b70a286 (patch) | |
| tree | 3ebf17b8c6765ec252bf0e59a40894f4da658d1b | |
| parent | 22cf03d8ca6b4a41792526f8b8d1bfb1f4b1bcd9 (diff) | |
| parent | 1b8bf1a6dc34d104aeed153748314717388ff54c (diff) | |
Merge "[Thread] define Thread hardware feature" into main am: 12e71635e8 am: 1023632c88 am: 0414c91c03 am: 1b8bf1a6dc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2605725
Change-Id: I8eb3347182a8bda56abd5bb4838e863e68effa88
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 ce3a9d49df82..b6684dd465a2 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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_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 9933c8be6015..de9547a7a9b2 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -3666,6 +3666,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) |