Merge "Fix networking API per scripting checks." into lmp-dev (a0843f49) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −2

core/java/android/net/ConnectivityManager.java

+4 −4

core/java/android/net/LinkAddress.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -274,7 +274,6 @@ public class LinkAddress implements Parcelable {

	/**		/**
	* Implement the Parcelable interface.		* Implement the Parcelable interface.
	* @hide
	*/		*/
	public int describeContents() {		public int describeContents() {
	return 0;		return 0;
	@@ -282,7 +281,6 @@ public class LinkAddress implements Parcelable {

	/**		/**
	* Implement the Parcelable interface.		* Implement the Parcelable interface.
	* @hide
	*/		*/
	public void writeToParcel(Parcel dest, int flags) {		public void writeToParcel(Parcel dest, int flags) {
	dest.writeByteArray(address.getAddress());		dest.writeByteArray(address.getAddress());
	@@ -293,7 +291,6 @@ public class LinkAddress implements Parcelable {

	/**		/**
	* Implement the Parcelable interface.		* Implement the Parcelable interface.
	* @hide
	*/		*/
	public static final Creator<LinkAddress> CREATOR =		public static final Creator<LinkAddress> CREATOR =
	new Creator<LinkAddress>() {		new Creator<LinkAddress>() {

Original line number	Original line	Diff line number	Diff line
	@@ -17014,6 +17014,7 @@ package android.mtp {
	package android.net {		package android.net {

	public class ConnectivityManager {		public class ConnectivityManager {
			method public void addDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
	method public android.net.NetworkInfo getActiveNetworkInfo();		method public android.net.NetworkInfo getActiveNetworkInfo();
	method public android.net.NetworkInfo[] getAllNetworkInfo();		method public android.net.NetworkInfo[] getAllNetworkInfo();
	method public android.net.Network[] getAllNetworks();		method public android.net.Network[] getAllNetworks();
	@@ -17027,8 +17028,8 @@ package android.net {
	method public boolean isActiveNetworkMetered();		method public boolean isActiveNetworkMetered();
	method public boolean isDefaultNetworkActive();		method public boolean isDefaultNetworkActive();
	method public static boolean isNetworkTypeValid(int);		method public static boolean isNetworkTypeValid(int);
	method public void registerDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
	method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);		method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
			method public void removeDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
	method public void reportBadNetwork(android.net.Network);		method public void reportBadNetwork(android.net.Network);
	method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);		method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
	method public deprecated boolean requestRouteToHost(int, int);		method public deprecated boolean requestRouteToHost(int, int);
	@@ -17036,7 +17037,6 @@ package android.net {
	method public static boolean setProcessDefaultNetwork(android.net.Network);		method public static boolean setProcessDefaultNetwork(android.net.Network);
	method public deprecated int startUsingNetworkFeature(int, java.lang.String);		method public deprecated int startUsingNetworkFeature(int, java.lang.String);
	method public deprecated int stopUsingNetworkFeature(int, java.lang.String);		method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
	method public void unregisterDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
	method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);		method public void unregisterNetworkCallback(android.net.ConnectivityManager.NetworkCallback);
	field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";		field public static final deprecated java.lang.String ACTION_BACKGROUND_DATA_SETTING_CHANGED = "android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";
	field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";		field public static final java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
	@@ -17110,6 +17110,7 @@ package android.net {
	method public int getPrefixLength();		method public int getPrefixLength();
	method public int getScope();		method public int getScope();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
			field public static final android.os.Parcelable.Creator CREATOR;
	}		}

	public final class LinkProperties implements android.os.Parcelable {		public final class LinkProperties implements android.os.Parcelable {

Original line number	Original line	Diff line number	Diff line
	@@ -1298,7 +1298,7 @@ public class ConnectivityManager {
	}		}

	/**		/**
	* Callback for use with {@link ConnectivityManager#registerDefaultNetworkActiveListener}		* Callback for use with {@link ConnectivityManager#addDefaultNetworkActiveListener}
	* to find out when the system default network has gone in to a high power state.		* to find out when the system default network has gone in to a high power state.
	*/		*/
	public interface OnNetworkActiveListener {		public interface OnNetworkActiveListener {
	@@ -1340,7 +1340,7 @@ public class ConnectivityManager {
	*		*
	* @param l The listener to be told when the network is active.		* @param l The listener to be told when the network is active.
	*/		*/
	public void registerDefaultNetworkActiveListener(final OnNetworkActiveListener l) {		public void addDefaultNetworkActiveListener(final OnNetworkActiveListener l) {
	INetworkActivityListener rl = new INetworkActivityListener.Stub() {		INetworkActivityListener rl = new INetworkActivityListener.Stub() {
	@Override		@Override
	public void onNetworkActive() throws RemoteException {		public void onNetworkActive() throws RemoteException {
	@@ -1357,11 +1357,11 @@ public class ConnectivityManager {

	/**		/**
	* Remove network active listener previously registered with		* Remove network active listener previously registered with
	* {@link #registerDefaultNetworkActiveListener}.		* {@link #addDefaultNetworkActiveListener}.
	*		*
	* @param l Previously registered listener.		* @param l Previously registered listener.
	*/		*/
	public void unregisterDefaultNetworkActiveListener(OnNetworkActiveListener l) {		public void removeDefaultNetworkActiveListener(OnNetworkActiveListener l) {
	INetworkActivityListener rl = mNetworkActivityListeners.get(l);		INetworkActivityListener rl = mNetworkActivityListeners.get(l);
	if (rl == null) {		if (rl == null) {
	throw new IllegalArgumentException("Listener not registered: " + l);		throw new IllegalArgumentException("Listener not registered: " + l);