Merge "Make SIP AuthName APIs public." (6166bacb) · Commits · e / os / android_frameworks_base

api/current.xml

+24 −0

Original line number	Diff line number	Diff line
		@@ -119000,6 +119000,17 @@
		visibility="public"
		>
		</method>
		<method name="getAuthUserName"
		return="java.lang.String"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getAutoRegistration"
		return="boolean"
		abstract="false"
		@@ -119202,6 +119213,19 @@
		visibility="public"
		>
		</method>
		<method name="setAuthUserName"
		return="android.net.sip.SipProfile.Builder"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="name" type="java.lang.String">
		</parameter>
		</method>
		<method name="setAutoRegistration"
		return="android.net.sip.SipProfile.Builder"
		abstract="false"

+4 −5

Original line number	Diff line number	Diff line
		@@ -150,9 +150,8 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {
		/**
		* Sets the username used for authentication.
		*
		* @param name auth. name of the profile
		* @param name authentication username of the profile
		* @return this builder object
		* @hide // TODO: remove when we make it public
		*/
		public Builder setAuthUserName(String name) {
		mProfile.mAuthUserName = name;
		@@ -391,10 +390,10 @@ public class SipProfile implements Parcelable, Serializable, Cloneable {

		/**
		* Gets the username for authentication. If it is null, then the username
		* should be used in authentication instead.
		* is used in authentication instead.
		*
		* @return the auth. username
		* @hide // TODO: remove when we make it public
		* @return the authentication username
		* @see #getUserName
		*/
		public String getAuthUserName() {
		return mAuthUserName;