Merge "update the current.xml to fix build error" into gingerbread (f5559638) · Commits · e / os / android_frameworks_base

api/current.xml

+25 −1

Original line number	Diff line number	Diff line
		@@ -77370,7 +77370,7 @@
		type="float"
		transient="false"
		volatile="false"
		value="0.0010f"
		value="0.001f"
		static="true"
		final="true"
		deprecated="not deprecated"
		@@ -99264,6 +99264,17 @@
		visibility="public"
		>
		</method>
		<method name="getKeepAliveInterval"
		return="int"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</method>
		<method name="getPassword"
		return="java.lang.String"
		abstract="false"
		@@ -99470,6 +99481,19 @@
		<parameter name="displayName" type="java.lang.String">
		</parameter>
		</method>
		<method name="setKeepAliveInterval"
		return="android.net.sip.SipProfile.Builder"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="interval" type="int">
		</parameter>
		</method>
		<method name="setOutboundProxy"
		return="android.net.sip.SipProfile.Builder"
		abstract="false"