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

Merge "Completely detach old data stack" am: f2b55a0e9b

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

Change-Id: I41add7637b6ad048a7e205247e76b5ceebb85d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jack Yu
2022-05-06 03:10:43 +00:00
committed by Automerger Merge Worker
parent 311958411a f2b55a0e9b
commit 3a82e4fbdd
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

@@ -8145,24 +8145,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
*/ */