am 2d0ab42b: Merge "Apply API Council comments to ConnectivityManager" into lmp-preview-dev (52a32726) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −17

Original line number	Diff line number	Diff line
		@@ -16096,28 +16096,25 @@ package android.net {
		method public deprecated int getNetworkPreference();
		method public static android.net.Network getProcessDefaultNetwork();
		method public boolean isActiveNetworkMetered();
		method public boolean isNetworkActive();
		method public boolean isDefaultNetworkActive();
		method public static boolean isNetworkTypeValid(int);
		method public android.net.NetworkRequest listenForNetwork(android.net.NetworkCapabilities, android.net.ConnectivityManager.NetworkCallbackListener);
		method public void registerNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
		method public void releaseNetworkRequest(android.net.NetworkRequest);
		method public void registerDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
		method public void registerNetworkCallback(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
		method public void reportBadNetwork(android.net.Network);
		method public android.net.NetworkRequest requestNetwork(android.net.NetworkCapabilities, android.net.ConnectivityManager.NetworkCallbackListener);
		method public android.net.NetworkRequest requestNetwork(android.net.NetworkCapabilities, android.app.PendingIntent);
		method public void requestNetwork(android.net.NetworkRequest, android.net.ConnectivityManager.NetworkCallback);
		method public deprecated boolean requestRouteToHost(int, int);
		method public deprecated void setNetworkPreference(int);
		method public static boolean setProcessDefaultNetwork(android.net.Network);
		method public deprecated int startUsingNetworkFeature(int, java.lang.String);
		method public deprecated int stopUsingNetworkFeature(int, java.lang.String);
		method public void unregisterNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
		method public void unregisterDefaultNetworkActiveListener(android.net.ConnectivityManager.OnNetworkActiveListener);
		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 java.lang.String CONNECTIVITY_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
		field public static final deprecated int DEFAULT_NETWORK_PREFERENCE = 1; // 0x1
		field public static final java.lang.String EXTRA_EXTRA_INFO = "extraInfo";
		field public static final java.lang.String EXTRA_IS_FAILOVER = "isFailover";
		field public static final deprecated java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NETWORK_REQUEST_NETWORK = "networkRequestNetwork";
		field public static final java.lang.String EXTRA_NETWORK_REQUEST_NETWORK_CAPABILITIES = "networkRequestNetworkCapabilities";
		field public static final java.lang.String EXTRA_NETWORK_TYPE = "networkType";
		field public static final java.lang.String EXTRA_NO_CONNECTIVITY = "noConnectivity";
		field public static final java.lang.String EXTRA_OTHER_NETWORK_INFO = "otherNetwork";
		@@ -16134,14 +16131,13 @@ package android.net {
		field public static final int TYPE_WIMAX = 6; // 0x6
		}

		public static class ConnectivityManager.NetworkCallbackListener {
		ctor public ConnectivityManager.NetworkCallbackListener();
		method public void onAvailable(android.net.NetworkRequest, android.net.Network);
		method public void onLinkPropertiesChanged(android.net.NetworkRequest, android.net.Network, android.net.LinkProperties);
		method public void onLosing(android.net.NetworkRequest, android.net.Network, int);
		method public void onLost(android.net.NetworkRequest, android.net.Network);
		method public void onNetworkCapabilitiesChanged(android.net.NetworkRequest, android.net.Network, android.net.NetworkCapabilities);
		method public void onReleased(android.net.NetworkRequest);
		public static class ConnectivityManager.NetworkCallback {
		ctor public ConnectivityManager.NetworkCallback();
		method public void onAvailable(android.net.Network);
		method public void onCapabilitiesChanged(android.net.Network, android.net.NetworkCapabilities);
		method public void onLinkPropertiesChanged(android.net.Network, android.net.LinkProperties);
		method public void onLosing(android.net.Network, int);
		method public void onLost(android.net.Network);
		}

		public static abstract interface ConnectivityManager.OnNetworkActiveListener {

core/java/android/net/ConnectivityManager.java

+142 −153

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/net/Network.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -29,8 +29,9 @@ import javax.net.SocketFactory;

		/**
		* Identifies a {@code Network}. This is supplied to applications via
		* {@link ConnectivityManager.NetworkCallbackListener} in response to
		* {@link ConnectivityManager#requestNetwork} or {@link ConnectivityManager#listenForNetwork}.
		* {@link ConnectivityManager.NetworkCallback} in response to the active
		* {@link ConnectivityManager#requestNetwork} or passive
		* {@link ConnectivityManager#registerNetworkCallback} calls.
		* It is used to direct traffic to the given {@code Network}, either on a {@link Socket} basis
		* through a targeted {@link SocketFactory} or process-wide via
		* {@link ConnectivityManager#setProcessDefaultNetwork}.

core/java/android/net/NetworkRequest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
		/**
		* Defines a request for a network, made through {@link NetworkRequest.Builder} and used
		* to request a network via {@link ConnectivityManager#requestNetwork} or listen for changes
		* via {@link ConnectivityManager#listenForNetwork}.
		* via {@link ConnectivityManager#registerNetworkCallback}.
		*/
		public class NetworkRequest implements Parcelable {
		/**

services/core/java/com/android/server/ConnectivityService.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import static android.Manifest.permission.MANAGE_NETWORK_POLICY;
		import static android.Manifest.permission.RECEIVE_DATA_ACTIVITY_CHANGE;
		import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
		import static android.net.ConnectivityManager.CONNECTIVITY_ACTION_IMMEDIATE;
		import static android.net.ConnectivityManager.NetworkCallbackListener;
		import static android.net.ConnectivityManager.TYPE_BLUETOOTH;
		import static android.net.ConnectivityManager.TYPE_DUMMY;
		import static android.net.ConnectivityManager.TYPE_MOBILE;
		@@ -5410,7 +5409,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {

		@Override
		public NetworkRequest requestNetwork(NetworkCapabilities networkCapabilities,
		Messenger messenger, int timeoutSec, IBinder binder, int legacyType) {
		Messenger messenger, int timeoutMs, IBinder binder, int legacyType) {
		if (networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED)
		== false) {
		enforceConnectivityInternalPermission();
		@@ -5418,7 +5417,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		enforceChangePermission();
		}

		if (timeoutSec < 0 \|\| timeoutSec > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_SEC) {
		if (timeoutMs < 0 \|\| timeoutMs > ConnectivityManager.MAX_NETWORK_REQUEST_TIMEOUT_MS) {
		throw new IllegalArgumentException("Bad timeout specified");
		}
		NetworkRequest networkRequest = new NetworkRequest(new NetworkCapabilities(
		@@ -5428,9 +5427,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		NetworkRequestInfo.REQUEST);

		mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_REQUEST, nri));
		if (timeoutSec > 0) {
		if (timeoutMs > 0) {
		mHandler.sendMessageDelayed(mHandler.obtainMessage(EVENT_TIMEOUT_NETWORK_REQUEST,
		nri), timeoutSec * 1000);
		nri), timeoutMs);
		}
		return networkRequest;
		}
		@@ -5694,7 +5693,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		int a2 = 0;
		switch (notificationType) {
		case ConnectivityManager.CALLBACK_LOSING:
		a1 = 30; // TODO - read this from NetworkMonitor
		a1 = 30 * 1000; // TODO - read this from NetworkMonitor
		// fall through
		case ConnectivityManager.CALLBACK_PRECHECK:
		case ConnectivityManager.CALLBACK_AVAILABLE:

services/core/java/com/android/server/job/controllers/ConnectivityController.java

+1 −1

File changed.

Contains only whitespace changes.