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

Merge "Completely detach old data stack" into tm-dev am: 1300565d76

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17168219

Change-Id: I793d7b37e3b1585e1cf1262e827aabbc6aa582e8
This commit is contained in:
TreeHugger Robot
2022-03-15 02:17:36 +00:00
committed by Automerger Merge Worker
parent 7d62f30167 1300565d76
commit 4708af6cf6
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8351,24 +8351,6 @@ public class TelephonyManager {
return -1; 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. * 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 * Used by diagnostic apps to force the IMS stack to be disabled and re-enabled in an effort to

8
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -977,14 +977,6 @@ interface ITelephony {
*/ */
boolean isManualNetworkSelectionAllowed(int subId); 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 * Set IMS registration state
*/ */