Merge "Deprecate redundant IMS APIs in TelephonyManager." am: 8012f3df57 (cf7c905b) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -8108,7 +8108,7 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean disableDataConnectivity();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableDataConnectivity();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean enableModemForSlot(int, boolean);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void enableVideoCalling(boolean);
		method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void enableVideoCalling(boolean);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getAidForAppType(int);
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<android.service.carrier.CarrierIdentifier> getAllowedCarriers(int);
		method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);
		@@ -8155,7 +8155,7 @@ package android.telephony {
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isPotentialEmergencyNumber(@NonNull String);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRadioOn();
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isRinging();
		method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isVideoCallingEnabled();
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isVideoCallingEnabled();
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
		method public boolean needsOtaServiceProvisioning();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean rebootRadio();

telephony/java/android/telephony/TelephonyManager.java

+21 −2

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@ import android.telephony.VisualVoicemailService.VisualVoicemailTask;
		import android.telephony.data.ApnSetting;
		import android.telephony.emergency.EmergencyNumber;
		import android.telephony.emergency.EmergencyNumber.EmergencyServiceCategories;
		import android.telephony.ims.ImsMmTelManager;
		import android.telephony.ims.aidl.IImsConfig;
		import android.telephony.ims.aidl.IImsMmTelFeature;
		import android.telephony.ims.aidl.IImsRcsFeature;
		@@ -8606,7 +8607,12 @@ public class TelephonyManager {
		return -1;
		}

		/** @hide */
		/**
		* @deprecated Use {@link android.telephony.ims.ImsMmTelManager#setVtSettingEnabled(boolean)}
		* instead.
		* @hide
		*/
		@Deprecated
		@SystemApi
		@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
		public void enableVideoCalling(boolean enable) {
		@@ -8619,7 +8625,14 @@ public class TelephonyManager {
		}
		}

		/** @hide */
		/**
		* @deprecated Use {@link ImsMmTelManager#isVtSettingEnabled()} instead to check if the user
		* has enabled the Video Calling setting, {@link ImsMmTelManager#isAvailable(int, int)} to
		* determine if video calling is available, or {@link ImsMmTelManager#isCapable(int, int)} to
		* determine if video calling is capable.
		* @hide
		*/
		@Deprecated
		@SystemApi
		@RequiresPermission(anyOf = {
		android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
		@@ -8739,6 +8752,7 @@ public class TelephonyManager {
		* @param subId Subscription ID
		* @return true if IMS status is registered, false if the IMS status is not registered or a
		* RemoteException occurred.
		* Use {@link ImsMmTelManager.RegistrationCallback} instead.
		* @hide
		*/
		public boolean isImsRegistered(int subId) {
		@@ -8775,6 +8789,8 @@ public class TelephonyManager {
		* used during creation, the default subscription ID will be used.
		* @return true if Voice over LTE is available or false if it is unavailable or unknown.
		* @see SubscriptionManager#getDefaultSubscriptionId()
		* <p>
		* Use {@link ImsMmTelManager#isAvailable(int, int)} instead.
		* @hide
		*/
		@UnsupportedAppUsage
		@@ -8794,6 +8810,7 @@ public class TelephonyManager {
		* used during creation, the default subscription ID will be used. To query the
		* underlying technology that VT is available on, use {@link #getImsRegTechnologyForMmTel}.
		* @return true if VT is available, or false if it is unavailable or unknown.
		* Use {@link ImsMmTelManager#isAvailable(int, int)} instead.
		* @hide
		*/
		@UnsupportedAppUsage
		@@ -8809,6 +8826,7 @@ public class TelephonyManager {
		* Returns the Status of Wi-Fi calling (Voice over WiFi) for the subscription ID specified.
		* @param subId the subscription ID.
		* @return true if VoWiFi is available, or false if it is unavailable or unknown.
		* Use {@link ImsMmTelManager#isAvailable(int, int)} instead.
		* @hide
		*/
		@UnsupportedAppUsage
		@@ -8829,6 +8847,7 @@ public class TelephonyManager {
		* - {@link ImsRegistrationImplBase#REGISTRATION_TECH_IWLAN} for IWLAN registration, or
		* - {@link ImsRegistrationImplBase#REGISTRATION_TECH_NONE} if we are not registered or the
		* result is unavailable.
		* Use {@link ImsMmTelManager.RegistrationCallback} instead.
		* @hide
		*/
		public @ImsRegistrationImplBase.ImsRegistrationTech int getImsRegTechnologyForMmTel() {