Merge "Fix javadoc links in SubscriptionManager and TelephonyManager" into main (31adde6b) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1456,21 +1456,21 @@ public class SubscriptionManager {
	public static final int SERVICE_CAPABILITY_MAX = SERVICE_CAPABILITY_DATA;		public static final int SERVICE_CAPABILITY_MAX = SERVICE_CAPABILITY_DATA;

	/**		/**
	* Bitmask for {@code SERVICE_CAPABILITY_VOICE}.		* Bitmask for {@link #SERVICE_CAPABILITY_VOICE}.
	* @hide		* @hide
	*/		*/
	public static final int SERVICE_CAPABILITY_VOICE_BITMASK =		public static final int SERVICE_CAPABILITY_VOICE_BITMASK =
	serviceCapabilityToBitmask(SERVICE_CAPABILITY_VOICE);		serviceCapabilityToBitmask(SERVICE_CAPABILITY_VOICE);

	/**		/**
	* Bitmask for {@code SERVICE_CAPABILITY_SMS}.		* Bitmask for {@link #SERVICE_CAPABILITY_SMS}.
	* @hide		* @hide
	*/		*/
	public static final int SERVICE_CAPABILITY_SMS_BITMASK =		public static final int SERVICE_CAPABILITY_SMS_BITMASK =
	serviceCapabilityToBitmask(SERVICE_CAPABILITY_SMS);		serviceCapabilityToBitmask(SERVICE_CAPABILITY_SMS);

	/**		/**
	* Bitmask for {@code SERVICE_CAPABILITY_DATA}.		* Bitmask for {@link #SERVICE_CAPABILITY_DATA}.
	* @hide		* @hide
	*/		*/
	public static final int SERVICE_CAPABILITY_DATA_BITMASK =		public static final int SERVICE_CAPABILITY_DATA_BITMASK =

telephony/java/android/telephony/TelephonyManager.java

+10 −11

Original line number	Original line	Diff line number	Diff line
	@@ -6907,7 +6907,6 @@ public class TelephonyManager {
	return false;		return false;
	}		}

	// TODO(b/316183370): replace all @code with @link in javadoc after feature is released
	/**		/**
	* @return true if the current device is "voice capable".		* @return true if the current device is "voice capable".
	* <p>		* <p>
	@@ -6921,10 +6920,10 @@ public class TelephonyManager {
	* PackageManager.FEATURE_TELEPHONY system feature, which is available		* PackageManager.FEATURE_TELEPHONY system feature, which is available
	* on any device with a telephony radio, even if the device is		* on any device with a telephony radio, even if the device is
	* data-only.		* data-only.
	* @deprecated Replaced by {@code #isDeviceVoiceCapable()}. Starting from Android 15, voice		* @deprecated Replaced by {@link #isDeviceVoiceCapable()}. Starting from Android 15, voice
	* capability may also be overridden by carriers for a given subscription. For voice capable		* capability may also be overridden by carriers for a given subscription. For voice capable
	* device (when {@code #isDeviceVoiceCapable} return {@code true}), caller should check for		* device (when {@link #isDeviceVoiceCapable} return {@code true}), caller should check for
	* subscription-level voice capability as well. See {@code #isDeviceVoiceCapable} for details.		* subscription-level voice capability as well. See {@link #isDeviceVoiceCapable} for details.
	*/		*/
	@Deprecated		@Deprecated
	public boolean isVoiceCapable() {		public boolean isVoiceCapable() {
	@@ -6946,8 +6945,8 @@ public class TelephonyManager {
	* <p>		* <p>
	* Starting from Android 15, voice capability may also be overridden by carrier for a given		* Starting from Android 15, voice capability may also be overridden by carrier for a given
	* subscription on a voice capable device. To check if a subscription is "voice capable",		* subscription on a voice capable device. To check if a subscription is "voice capable",
	* call method {@code SubscriptionInfo#getServiceCapabilities()} and check if		* call method {@link SubscriptionInfo#getServiceCapabilities()} and check if
	* {@code SubscriptionManager#SERVICE_CAPABILITY_VOICE} is included.		* {@link SubscriptionManager#SERVICE_CAPABILITY_VOICE} is included.
	*		*
	* @see SubscriptionInfo#getServiceCapabilities()		* @see SubscriptionInfo#getServiceCapabilities()
	*/		*/
	@@ -6964,10 +6963,10 @@ public class TelephonyManager {
	* <p>		* <p>
	* Note: Voicemail waiting sms, cell broadcasting sms, and MMS are		* Note: Voicemail waiting sms, cell broadcasting sms, and MMS are
	* disabled when device doesn't support sms.		* disabled when device doesn't support sms.
	* @deprecated Replaced by {@code #isDeviceSmsCapable()}. Starting from Android 15, SMS		* @deprecated Replaced by {@link #isDeviceSmsCapable()}. Starting from Android 15, SMS
	* capability may also be overridden by carriers for a given subscription. For SMS capable		* capability may also be overridden by carriers for a given subscription. For SMS capable
	* device (when {@code #isDeviceSmsCapable} return {@code true}), caller should check for		* device (when {@link #isDeviceSmsCapable} return {@code true}), caller should check for
	* subscription-level SMS capability as well. See {@code #isDeviceSmsCapable} for details.		* subscription-level SMS capability as well. See {@link #isDeviceSmsCapable} for details.
	*/		*/
	@Deprecated		@Deprecated
	public boolean isSmsCapable() {		public boolean isSmsCapable() {
	@@ -6986,8 +6985,8 @@ public class TelephonyManager {