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

Merge "[Thread] rename FEATURE_THREADNETWORK to FEATURE_THREAD_NETWORK" into main am: a3ad41ea3d

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

Change-Id: Ia5053202a81407f526b5d68a60507d18bbc258f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kangping Dong
2023-08-11 03:06:54 +00:00
committed by Automerger Merge Worker
parent 0936166e90 a3ad41ea3d
commit d1f4348edf
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -12037,7 +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_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";

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

@@ -3454,12 +3454,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