diff options
| author | 2023-08-11 03:50:42 +0000 | |
|---|---|---|
| committer | 2023-08-11 03:50:42 +0000 | |
| commit | e2e419c4894df44dc7c6c2f2cb96fa8dfb61c9c0 (patch) | |
| tree | 6feb3420d5972daab22fbcda5ea3acd6b72bd98f | |
| parent | 88bacd764b465d594cb382c0bee6878f6d80b08b (diff) | |
| parent | d1f4348edf3d364a1887477b4268b5006acd7df8 (diff) | |
Merge "[Thread] rename FEATURE_THREADNETWORK to FEATURE_THREAD_NETWORK" into main am: a3ad41ea3d am: d1f4348edf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2689526
Change-Id: I6e56c99d3433d0f01e7e652c1e7ba32bc972f51f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 1050cbf94d25..e37beb3abd14 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -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"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 7128b126c8ec..02650c65e1a4 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -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 |