Merge "Completely detach old data stack" into tm-dev (1300565d) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -8351,24 +8351,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

+0 −8

Original line number	Diff line number	Diff line
		@@ -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
		*/