diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-03-13 14:04:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-03-13 14:04:40 +0000 |
| commit | cbfaae4f0ce74c32d0c201d9096afcd7f9253108 (patch) | |
| tree | bfd813bae829fc05bd6fb1452c546e52c0036cbb | |
| parent | 8f2ce6f24a710d7fddccbbd1d5d23c0a94954d24 (diff) | |
| parent | 47bc635f5c9e01c56a30b15b3cadbd5107161702 (diff) | |
Merge "Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis"
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 8 |
3 files changed, 6 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 0f37db2b586f..e803640bf5c6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -46062,7 +46062,6 @@ 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 diff --git a/api/system-current.txt b/api/system-current.txt index ab1ef4c453af..8de6290384ba 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9536,7 +9536,6 @@ 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 diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index d6224ba2f731..fbaf8d34ad8d 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2301,7 +2301,12 @@ 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. */ + + /** + * Phone is via IMS. + * + * @hide + */ public static final int PHONE_TYPE_IMS = PhoneConstants.PHONE_TYPE_IMS; /** @@ -2309,7 +2314,6 @@ public class TelephonyManager { * * @hide */ - @SystemApi public static final int PHONE_TYPE_THIRD_PARTY = PhoneConstants.PHONE_TYPE_THIRD_PARTY; /** |