Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3ad41ea authored by Kangping Dong's avatar Kangping Dong Committed by Gerrit Code Review
Browse files

Merge "[Thread] rename FEATURE_THREADNETWORK to FEATURE_THREAD_NETWORK" into main

parents 852ee8e4 6c1a4dcf

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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";

core/java/android/content/pm/PackageManager.java

+4 −4
Original line number Diff line number Diff line
@@ -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