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

Commit 356cf1d7 authored by Hui Wang's avatar Hui Wang Committed by Android (Google) Code Review
Browse files

Merge "Update the value of the flag of TELEPHONY_RADIO_ACCESS"

parents ee975e9c 76a1ccb3

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -11931,7 +11931,7 @@ package android.content.pm { 
    field public static final String FEATURE_TELEPHONY_IMS = "android.hardware.telephony.ims";

    field public static final String FEATURE_TELEPHONY_MBMS = "android.hardware.telephony.mbms";

    field public static final String FEATURE_TELEPHONY_MESSAGING = "android.hardware.telephony.messaging";

    field public static final String FEATURE_TELEPHONY_RADIO_ACCESS = "android.hardware.telephony.radio";

    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_TOUCHSCREEN = "android.hardware.touchscreen";

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

+2 −1
Original line number Diff line number Diff line
@@ -3326,7 +3326,8 @@ public abstract class PackageManager { 
     * <p>This feature should only be defined if {@link #FEATURE_TELEPHONY} has been defined.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TELEPHONY_RADIO_ACCESS = "android.hardware.telephony.radio";

    public static final String FEATURE_TELEPHONY_RADIO_ACCESS =

            "android.hardware.telephony.radio.access";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and {@link #hasSystemFeature}: