Merge tag 'android-5.1.1_r26' into cm-12.1 (bd0e2f21) · Commits · e / os / android_frameworks_base

core/java/android/net/ConnectivityManager.java

+2 −37

Original line number	Diff line number	Diff line
		@@ -1040,41 +1040,6 @@ public class ConnectivityManager {
		return 1;
		}

		/**
		* Removes the NET_CAPABILITY_NOT_RESTRICTED capability from the given
		* NetworkCapabilities object if all the capabilities it provides are
		* typically provided by restricted networks.
		*
		* TODO: consider:
		* - Moving to NetworkCapabilities
		* - Renaming it to guessRestrictedCapability and make it set the
		* restricted capability bit in addition to clearing it.
		* @hide
		*/
		public static void maybeMarkCapabilitiesRestricted(NetworkCapabilities nc) {
		for (int capability : nc.getCapabilities()) {
		switch (capability) {
		case NetworkCapabilities.NET_CAPABILITY_CBS:
		case NetworkCapabilities.NET_CAPABILITY_DUN:
		case NetworkCapabilities.NET_CAPABILITY_EIMS:
		case NetworkCapabilities.NET_CAPABILITY_FOTA:
		case NetworkCapabilities.NET_CAPABILITY_IA:
		case NetworkCapabilities.NET_CAPABILITY_IMS:
		case NetworkCapabilities.NET_CAPABILITY_RCS:
		case NetworkCapabilities.NET_CAPABILITY_XCAP:
		case NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED: //there by default
		continue;
		default:
		// At least one capability usually provided by unrestricted
		// networks. Conclude that this network is unrestricted.
		return;
		}
		}
		// All the capabilities are typically provided by restricted networks.
		// Conclude that this network is restricted.
		nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED);
		}

		private NetworkCapabilities networkCapabilitiesForFeature(int networkType, String feature) {
		if (networkType == TYPE_MOBILE) {
		int cap = -1;
		@@ -1097,14 +1062,14 @@ public class ConnectivityManager {
		}
		NetworkCapabilities netCap = new NetworkCapabilities();
		netCap.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR).addCapability(cap);
		maybeMarkCapabilitiesRestricted(netCap);
		netCap.maybeMarkCapabilitiesRestricted();
		return netCap;
		} else if (networkType == TYPE_WIFI) {
		if ("p2p".equals(feature)) {
		NetworkCapabilities netCap = new NetworkCapabilities();
		netCap.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
		netCap.addCapability(NetworkCapabilities.NET_CAPABILITY_WIFI_P2P);
		maybeMarkCapabilitiesRestricted(netCap);
		netCap.maybeMarkCapabilitiesRestricted();
		return netCap;
		}
		}

core/java/android/net/NetworkCapabilities.java

+44 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ public final class NetworkCapabilities implements Parcelable {
		* @hide
		*/
		public NetworkCapabilities() {
		mNetworkCapabilities = DEFAULT_CAPABILITIES;
		}

		public NetworkCapabilities(NetworkCapabilities nc) {
		@@ -53,8 +54,7 @@ public final class NetworkCapabilities implements Parcelable {
		* Represents the network's capabilities. If any are specified they will be satisfied
		* by any Network that matches all of them.
		*/
		private long mNetworkCapabilities = (1 << NET_CAPABILITY_NOT_RESTRICTED) \|
		(1 << NET_CAPABILITY_TRUSTED) \| (1 << NET_CAPABILITY_NOT_VPN);
		private long mNetworkCapabilities;

		/**
		* Indicates this is a network that has the ability to reach the
		@@ -165,6 +165,28 @@ public final class NetworkCapabilities implements Parcelable {
		private static final int MIN_NET_CAPABILITY = NET_CAPABILITY_MMS;
		private static final int MAX_NET_CAPABILITY = NET_CAPABILITY_VALIDATED;

		/**
		* Capabilities that are set by default when the object is constructed.
		*/
		private static final long DEFAULT_CAPABILITIES =
		(1 << NET_CAPABILITY_NOT_RESTRICTED) \|
		(1 << NET_CAPABILITY_TRUSTED) \|
		(1 << NET_CAPABILITY_NOT_VPN);

		/**
		* Capabilities that suggest that a network is restricted.
		* {@see #maybeMarkCapabilitiesRestricted}.
		*/
		private static final long RESTRICTED_CAPABILITIES =
		(1 << NET_CAPABILITY_CBS) \|
		(1 << NET_CAPABILITY_DUN) \|
		(1 << NET_CAPABILITY_EIMS) \|
		(1 << NET_CAPABILITY_FOTA) \|
		(1 << NET_CAPABILITY_IA) \|
		(1 << NET_CAPABILITY_IMS) \|
		(1 << NET_CAPABILITY_RCS) \|
		(1 << NET_CAPABILITY_XCAP);

		/**
		* Adds the given capability to this {@code NetworkCapability} instance.
		* Multiple capabilities may be applied sequentially. Note that when searching
		@@ -247,6 +269,26 @@ public final class NetworkCapabilities implements Parcelable {
		return (nc.mNetworkCapabilities == this.mNetworkCapabilities);
		}

		/**
		* Removes the NET_CAPABILITY_NOT_RESTRICTED capability if all the capabilities it provides are
		* typically provided by restricted networks.
		*
		* TODO: consider:
		* - Renaming it to guessRestrictedCapability and make it set the
		* restricted capability bit in addition to clearing it.
		* @hide
		*/
		public void maybeMarkCapabilitiesRestricted() {
		// If all the capabilities are typically provided by restricted networks, conclude that this
		// network is restricted.
		if ((mNetworkCapabilities & ~(DEFAULT_CAPABILITIES \| RESTRICTED_CAPABILITIES)) == 0 &&
		// Must have at least some restricted capabilities, otherwise a request for an
		// internet-less network will get marked restricted.
		(mNetworkCapabilities & RESTRICTED_CAPABILITIES) != 0) {
		removeCapability(NET_CAPABILITY_NOT_RESTRICTED);
		}
		}

		/**
		* Representing the transport type. Apps should generally not care about transport. A
		* request for a fast internet connection could be satisfied by a number of different

core/java/android/net/NetworkRequest.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -85,7 +85,13 @@ public class NetworkRequest implements Parcelable {
		* Build {@link NetworkRequest} give the current set of capabilities.
		*/
		public NetworkRequest build() {
		return new NetworkRequest(mNetworkCapabilities, ConnectivityManager.TYPE_NONE,
		// Make a copy of mNetworkCapabilities so we don't inadvertently remove NOT_RESTRICTED
		// when later an unrestricted capability could be added to mNetworkCapabilities, in
		// which case NOT_RESTRICTED should be returned to mNetworkCapabilities, which
		// maybeMarkCapabilitiesRestricted() doesn't add back.
		final NetworkCapabilities nc = new NetworkCapabilities(mNetworkCapabilities);
		nc.maybeMarkCapabilitiesRestricted();
		return new NetworkRequest(nc, ConnectivityManager.TYPE_NONE,
		ConnectivityManager.REQUEST_ID_UNSET);
		}

core/java/android/os/Build.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -158,12 +158,14 @@ public class Build {

		/**
		* The base OS build the product is based on.
		* For Pre-API 23 - use support libs to access.
		* @hide
		*/
		public static final String BASE_OS = SystemProperties.get("ro.build.version.base_os", "");

		/**
		* The user-visible security patch level.
		* For Pre-API 23 - use support libs to access.
		* @hide
		*/
		public static final String SECURITY_PATCH = SystemProperties.get(

core/java/android/os/INetworkManagementService.aidl

+10 −1

Original line number	Diff line number	Diff line
		@@ -382,8 +382,10 @@ interface INetworkManagementService

		/**
		* Setup a new physical network.
		* @param permission null if no permissions required to access this network. PERMISSION_NETWORK
		* or PERMISSION_SYSTEM to set respective permission.
		*/
		void createPhysicalNetwork(int netId);
		void createPhysicalNetwork(int netId, String permission);

		/**
		* Setup a new VPN.
		@@ -410,6 +412,13 @@ interface INetworkManagementService
		void setDefaultNetId(int netId);
		void clearDefaultNetId();

		/**
		* Set permission for a network.
		* @param permission null to clear permissions. PERMISSION_NETWORK or PERMISSION_SYSTEM to set
		* permission.
		*/
		void setNetworkPermission(int netId, String permission);

		void setPermission(String permission, in int[] uids);
		void clearPermission(in int[] uids);