Fix build. (692a244b) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -896,7 +896,7 @@ public class ConnectivityManager {
	*		*
	* @deprecated Deprecated in favor of the cleaner		* @deprecated Deprecated in favor of the cleaner
	* {@link #requestNetwork(NetworkRequest, NetworkCallback)} API.		* {@link #requestNetwork(NetworkRequest, NetworkCallback)} API.
	* In {@link VERSION_CODES#MNC}, and above, this method is unsupported and will		* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
	* throw {@code UnsupportedOperationException} if called.		* throw {@code UnsupportedOperationException} if called.
	*/		*/
	public int startUsingNetworkFeature(int networkType, String feature) {		public int startUsingNetworkFeature(int networkType, String feature) {
	@@ -946,7 +946,7 @@ public class ConnectivityManager {
	* always indicates failure.		* always indicates failure.
	*		*
	* @deprecated Deprecated in favor of the cleaner {@link #unregisterNetworkCallback} API.		* @deprecated Deprecated in favor of the cleaner {@link #unregisterNetworkCallback} API.
	* In {@link VERSION_CODES#MNC}, and above, this method is unsupported and will		* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
	* throw {@code UnsupportedOperationException} if called.		* throw {@code UnsupportedOperationException} if called.
	*/		*/
	public int stopUsingNetworkFeature(int networkType, String feature) {		public int stopUsingNetworkFeature(int networkType, String feature) {
	@@ -1228,7 +1228,7 @@ public class ConnectivityManager {
	* @deprecated Deprecated in favor of the		* @deprecated Deprecated in favor of the
	* {@link #requestNetwork(NetworkRequest, NetworkCallback)},		* {@link #requestNetwork(NetworkRequest, NetworkCallback)},
	* {@link #bindProcessToNetwork} and {@link Network#getSocketFactory} API.		* {@link #bindProcessToNetwork} and {@link Network#getSocketFactory} API.
	* In {@link VERSION_CODES#MNC}, and above, this method is unsupported and will		* In {@link VERSION_CODES#M}, and above, this method is unsupported and will
	* throw {@code UnsupportedOperationException} if called.		* throw {@code UnsupportedOperationException} if called.
	*/		*/
	public boolean requestRouteToHost(int networkType, int hostAddress) {		public boolean requestRouteToHost(int networkType, int hostAddress) {
	@@ -2742,7 +2742,7 @@ public class ConnectivityManager {
	return;		return;
	}		}

	unsupportedStartingFrom(VERSION_CODES.MNC);		unsupportedStartingFrom(VERSION_CODES.M);
	}		}

	/**		/**