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

Commit d1619e86 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "Add FEATURE_TELEPHONY_IMS definition" am: ad075a38 am: 86999554 

am: 93dd117e

Change-Id: Icb40054aaeab8921bc371129528b851e1af78e29
parents b19b9dca 93dd117e

api/current.txt

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

    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";

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

    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

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

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



    /**

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

     * supports attaching to IMS implementations using the ImsService API in telephony.

     */

    @SdkConstant(SdkConstantType.FEATURE)

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



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports connecting to USB devices