Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "phone-constants-telecom"

Browse Source 
* changes:
  Move PhoneConstants constants to TelecomManager
  Using PhoneTypes in TelephonyManager
This commit is contained in:
Hall Liu
2020-01-17 22:44:25 +00:00
committed by Gerrit Code Review
parent ede4533c15 4a9fde1770
commit d982f6c3bb
4 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -45763,6 +45763,7 @@ package android.telephony {
field public static final int NETWORK_TYPE_UNKNOWN = 0; // 0x0 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_CDMA = 2; // 0x2
field public static final int PHONE_TYPE_GSM = 1; // 0x1 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_NONE = 0; // 0x0
field public static final int PHONE_TYPE_SIP = 3; // 0x3 field public static final int PHONE_TYPE_SIP = 3; // 0x3
field public static final int SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION = 2; // 0x2 field public static final int SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION = 2; // 0x2

1
api/system-current.txt
View File

@@ -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_TD_SCDMA = 65536L; // 0x10000L
field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L 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 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_OFF = 0; // 0x0
field public static final int RADIO_POWER_ON = 1; // 0x1 field public static final int RADIO_POWER_ON = 1; // 0x1
field public static final int RADIO_POWER_UNAVAILABLE = 2; // 0x2 field public static final int RADIO_POWER_UNAVAILABLE = 2; // 0x2

11
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -848,6 +848,17 @@ public class TelecomManager {
*/ */
public static final int PRESENTATION_PAYPHONE = 4; 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 */ /** @hide */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef( @IntDef(

10
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1950,6 +1950,16 @@ public class TelephonyManager {
public static final int PHONE_TYPE_CDMA = PhoneConstants.PHONE_TYPE_CDMA; public static final int PHONE_TYPE_CDMA = PhoneConstants.PHONE_TYPE_CDMA;
/** Phone is via SIP. */ /** Phone is via SIP. */
public static final int PHONE_TYPE_SIP = PhoneConstants.PHONE_TYPE_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. * Returns the current phone type.