Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL" am: 80aefae026 am: e6e67e2396 (e62951f1) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -409,9 +409,12 @@ public class TelephonyManager {
	* Open the voicemail settings activity to make changes to voicemail configuration.		* Open the voicemail settings activity to make changes to voicemail configuration.
	*		*
	* <p>		* <p>
			* The {@link #EXTRA_PHONE_ACCOUNT_HANDLE} extra indicates which {@link PhoneAccountHandle} to
			* configure voicemail.
	* The {@link #EXTRA_HIDE_PUBLIC_SETTINGS} hides settings the dialer will modify through public		* The {@link #EXTRA_HIDE_PUBLIC_SETTINGS} hides settings the dialer will modify through public
	* API if set.		* API if set.
	*		*
			* @see #EXTRA_PHONE_ACCOUNT_HANDLE
	* @see #EXTRA_HIDE_PUBLIC_SETTINGS		* @see #EXTRA_HIDE_PUBLIC_SETTINGS
	*/		*/
	@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
	@@ -776,8 +779,9 @@ public class TelephonyManager {
	"android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";		"android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";

	/**		/**
	* The extra used with an {@link #ACTION_SHOW_VOICEMAIL_NOTIFICATION} {@code Intent} to specify		* The extra used with an {@link #ACTION_CONFIGURE_VOICEMAIL} and
	* the {@link PhoneAccountHandle} the notification is for.		* {@link #ACTION_SHOW_VOICEMAIL_NOTIFICATION} {@code Intent} to specify the
			* {@link PhoneAccountHandle} the configuration or notification is for.
	* <p class="note">		* <p class="note">
	* Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.		* Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.
	*/		*/