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

Commit 2b00f7fc authored by Daniel Bright's avatar Daniel Bright Committed by Android (Google) Code Review
Browse files

Merge "Add feature flag android.hardware.telephony.data"

parents e23003c2 9dd5ee63

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11928,6 +11928,7 @@ package android.content.pm { 
    field public static final String FEATURE_STRONGBOX_KEYSTORE = "android.hardware.strongbox_keystore";

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

    field public static final String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";

    field public static final String FEATURE_TELEPHONY_DATA = "android.hardware.telephony.data";

    field public static final String FEATURE_TELEPHONY_EUICC = "android.hardware.telephony.euicc";

    field public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";

    field public static final String FEATURE_TELEPHONY_IMS = "android.hardware.telephony.ims";

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

+7 −0
Original line number Diff line number Diff line
@@ -2322,6 +2322,13 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";



    /**

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

     * has a telephony radio that support data.

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_TELEPHONY_DATA = "android.hardware.telephony.data";



    /**

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

     * The device supports telephony carrier restriction mechanism.