From 47bc635f5c9e01c56a30b15b3cadbd5107161702 Mon Sep 17 00:00:00 2001 From: Daniel Bright Date: Wed, 11 Mar 2020 11:59:03 -0700 Subject: [PATCH] Remove PHONE_TYPE_IMS and PHONE_TYPE_THIRD_PARTY as apis Removing api status to several apis created during telephony mainline in R. Bug: 147465477 Bug: 151335267 Test: make Merged-In: I6d394fae478ef62769147beaeb944771a67aca70 Change-Id: I6d394fae478ef62769147beaeb944771a67aca70 --- api/current.txt | 1 - api/system-current.txt | 1 - 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 0f37db2b586f3..e803640bf5c67 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 472e114d4f7a8..a2a0bb1d7d7b0 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9549,7 +9549,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 d6224ba2f731e..fbaf8d34ad8d0 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; /**