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

Commit d982f6c3 authored by Hall Liu's avatar Hall Liu Committed by Gerrit Code Review
Browse files

Merge changes from topic "phone-constants-telecom" 

* changes:
  Move PhoneConstants constants to TelecomManager
  Using PhoneTypes in TelephonyManager
parents ede4533c 4a9fde17

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45763,6 +45763,7 @@ package android.telephony { 
    field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0

    field public static final int PHONE_TYPE_CDMA = 2; // 0x2

    field public static final int PHONE_TYPE_GSM = 1; // 0x1

    field public static final int PHONE_TYPE_IMS = 5; // 0x5

    field public static final int PHONE_TYPE_NONE = 0; // 0x0

    field public static final int PHONE_TYPE_SIP = 3; // 0x3

    field public static final int SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION = 2; // 0x2

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9335,6 +9335,7 @@ package android.telephony { 
    field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L

    field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L

    field public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L; // 0x0L

    field public static final int PHONE_TYPE_THIRD_PARTY = 4; // 0x4

    field public static final int RADIO_POWER_OFF = 0; // 0x0

    field public static final int RADIO_POWER_ON = 1; // 0x1

    field public static final int RADIO_POWER_UNAVAILABLE = 2; // 0x2

telecomm/java/android/telecom/TelecomManager.java

+11 −0
Original line number Diff line number Diff line
@@ -848,6 +848,17 @@ public class TelecomManager { 
     */

    public static final int PRESENTATION_PAYPHONE = 4;





    /*

     * Values for the adb property "persist.radio.videocall.audio.output"

     */

    /** @hide */

    public static final int AUDIO_OUTPUT_ENABLE_SPEAKER = 0;

    /** @hide */

    public static final int AUDIO_OUTPUT_DISABLE_SPEAKER = 1;

    /** @hide */

    public static final int AUDIO_OUTPUT_DEFAULT = AUDIO_OUTPUT_ENABLE_SPEAKER;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(

telephony/java/android/telephony/TelephonyManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1950,6 +1950,16 @@ public class TelephonyManager { 
    public static final int PHONE_TYPE_CDMA = PhoneConstants.PHONE_TYPE_CDMA;

    /** Phone is via SIP. */

    public static final int PHONE_TYPE_SIP = PhoneConstants.PHONE_TYPE_SIP;

    /** Phone is via IMS. */

    public static final int PHONE_TYPE_IMS = PhoneConstants.PHONE_TYPE_IMS;



    /**

     * Phone is via Third Party.

     *

     * @hide

     */

    @SystemApi

    public static final int PHONE_TYPE_THIRD_PARTY = PhoneConstants.PHONE_TYPE_THIRD_PARTY;



    /**

     * Returns the current phone type.