From ae26bc400bda429b44f4de2fbb70febcd588c266 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Fri, 11 Mar 2022 20:43:57 -0800 Subject: [PATCH] Completely detach old data stack Not create DcTracker and TransportManager instances when new data stack is enabled. Test: atest FrameworksTelephonyTests and manually tested on Pixel 4 and Pixel 6. Bug: 222323544 Merged-In: Ice595f329e2f4e531dc577cd3db7c863ba15d6d6 Change-Id: Ice595f329e2f4e531dc577cd3db7c863ba15d6d6 --- .../android/telephony/TelephonyManager.java | 18 ------------------ .../android/internal/telephony/ITelephony.aidl | 8 -------- 2 files changed, 26 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 56988ae0944df..e5d56849933e8 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -8145,24 +8145,6 @@ public class TelephonyManager { return -1; } - /** - * Get P-CSCF address from PCO after data connection is established or modified. - * @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN - * @return array of P-CSCF address - * @hide - */ - public String[] getPcscfAddress(String apnType) { - try { - ITelephony telephony = getITelephony(); - if (telephony == null) - return new String[0]; - return telephony.getPcscfAddress(apnType, getOpPackageName(), getAttributionTag()); - } catch (RemoteException e) { - return new String[0]; - } - } - - /** * Resets the {@link android.telephony.ims.ImsService} associated with the specified sim slot. * Used by diagnostic apps to force the IMS stack to be disabled and re-enabled in an effort to diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 7799113c5bf15..2c1167f0b8b9e 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -977,14 +977,6 @@ interface ITelephony { */ boolean isManualNetworkSelectionAllowed(int subId); - /** - * Get P-CSCF address from PCO after data connection is established or modified. - * @param apnType the apnType, "ims" for IMS APN, "emergency" for EMERGENCY APN - * @param callingPackage The package making the call. - * @param callingFeatureId The feature in the package. - */ - String[] getPcscfAddress(String apnType, String callingPackage, String callingFeatureId); - /** * Set IMS registration state */