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

Browse Source
This commit is contained in:
Kangping Dong
2023-08-11 01:58:39 +00:00
committed by Gerrit Code Review
parent 852ee8e483 6c1a4dcfa9
commit a3ad41ea3d
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_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_THREAD_NETWORK = "android.hardware.thread_network";
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

@@ -3454,12 +3454,12 @@ public abstract class PackageManager {
"android.hardware.telephony.subscription"; "android.hardware.telephony.subscription";
/** /**
* Feature for {@link #getSystemAvailableFeatures} and * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}:
* {@link #hasSystemFeature}: The device is capable of communicating with * The device is capable of communicating with other devices via
* other devices via Thread network. * <a href="https://www.threadgroup.org">Thread</a> networking protocol.
*/ */
@SdkConstant(SdkConstantType.FEATURE) @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 * Feature for {@link #getSystemAvailableFeatures} and