Merge "Created new public API so applications can customize its metered... (3e71e80e) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -22761,6 +22761,7 @@ package android.net {
		method public android.net.NetworkInfo getNetworkInfo(android.net.Network);
		method public deprecated int getNetworkPreference();
		method public static deprecated android.net.Network getProcessDefaultNetwork();
		method public int getRestrictBackgroundStatus();
		method public boolean isActiveNetworkMetered();
		method public boolean isDefaultNetworkActive();
		method public static deprecated boolean isNetworkTypeValid(int);
		@@ -22795,6 +22796,9 @@ package android.net {
		field public static final java.lang.String EXTRA_NO_CONNECTIVITY = "noConnectivity";
		field public static final java.lang.String EXTRA_OTHER_NETWORK_INFO = "otherNetwork";
		field public static final java.lang.String EXTRA_REASON = "reason";
		field public static final int RESTRICT_BACKGROUND_STATUS_DISABLED = 1; // 0x1
		field public static final int RESTRICT_BACKGROUND_STATUS_ENABLED = 3; // 0x3
		field public static final int RESTRICT_BACKGROUND_STATUS_WHITELISTED = 2; // 0x2
		field public static final int TYPE_BLUETOOTH = 7; // 0x7
		field public static final int TYPE_DUMMY = 8; // 0x8
		field public static final int TYPE_ETHERNET = 9; // 0x9
		@@ -22821,6 +22825,9 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public static abstract class ConnectivityManager.RestrictBackgroundStatus implements java.lang.annotation.Annotation {
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();

api/system-current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -24349,6 +24349,7 @@ package android.net {
		method public android.net.NetworkInfo getNetworkInfo(android.net.Network);
		method public deprecated int getNetworkPreference();
		method public static deprecated android.net.Network getProcessDefaultNetwork();
		method public int getRestrictBackgroundStatus();
		method public boolean isActiveNetworkMetered();
		method public boolean isDefaultNetworkActive();
		method public static deprecated boolean isNetworkTypeValid(int);
		@@ -24383,6 +24384,9 @@ package android.net {
		field public static final java.lang.String EXTRA_NO_CONNECTIVITY = "noConnectivity";
		field public static final java.lang.String EXTRA_OTHER_NETWORK_INFO = "otherNetwork";
		field public static final java.lang.String EXTRA_REASON = "reason";
		field public static final int RESTRICT_BACKGROUND_STATUS_DISABLED = 1; // 0x1
		field public static final int RESTRICT_BACKGROUND_STATUS_ENABLED = 3; // 0x3
		field public static final int RESTRICT_BACKGROUND_STATUS_WHITELISTED = 2; // 0x2
		field public static final int TYPE_BLUETOOTH = 7; // 0x7
		field public static final int TYPE_DUMMY = 8; // 0x8
		field public static final int TYPE_ETHERNET = 9; // 0x9
		@@ -24409,6 +24413,9 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public static abstract class ConnectivityManager.RestrictBackgroundStatus implements java.lang.annotation.Annotation {
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();

api/test-current.txt

+7 −0

Original line number	Diff line number	Diff line
		@@ -22769,6 +22769,7 @@ package android.net {
		method public android.net.NetworkInfo getNetworkInfo(android.net.Network);
		method public deprecated int getNetworkPreference();
		method public static deprecated android.net.Network getProcessDefaultNetwork();
		method public int getRestrictBackgroundStatus();
		method public boolean isActiveNetworkMetered();
		method public boolean isDefaultNetworkActive();
		method public static deprecated boolean isNetworkTypeValid(int);
		@@ -22803,6 +22804,9 @@ package android.net {
		field public static final java.lang.String EXTRA_NO_CONNECTIVITY = "noConnectivity";
		field public static final java.lang.String EXTRA_OTHER_NETWORK_INFO = "otherNetwork";
		field public static final java.lang.String EXTRA_REASON = "reason";
		field public static final int RESTRICT_BACKGROUND_STATUS_DISABLED = 1; // 0x1
		field public static final int RESTRICT_BACKGROUND_STATUS_ENABLED = 3; // 0x3
		field public static final int RESTRICT_BACKGROUND_STATUS_WHITELISTED = 2; // 0x2
		field public static final int TYPE_BLUETOOTH = 7; // 0x7
		field public static final int TYPE_DUMMY = 8; // 0x8
		field public static final int TYPE_ETHERNET = 9; // 0x9
		@@ -22829,6 +22833,9 @@ package android.net {
		method public abstract void onNetworkActive();
		}

		public static abstract class ConnectivityManager.RestrictBackgroundStatus implements java.lang.annotation.Annotation {
		}

		public class Credentials {
		ctor public Credentials(int, int, int);
		method public int getGid();

core/java/android/net/ConnectivityManager.java

+58 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		package android.net;

		import static com.android.internal.util.Preconditions.checkNotNull;

		import android.annotation.IntDef;
		import android.annotation.Nullable;
		import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		@@ -49,6 +49,8 @@ import com.android.internal.util.Protocol;

		import libcore.net.event.NetworkEventDispatcher;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.net.InetAddress;
		import java.util.HashMap;
		import java.util.concurrent.atomic.AtomicInteger;
		@@ -512,6 +514,7 @@ public class ConnectivityManager {
		private final Context mContext;

		private INetworkManagementService mNMService;
		private INetworkPolicyManager mNPManager;

		/**
		* Tests if a given integer represents a valid network type.
		@@ -3025,4 +3028,58 @@ public class ConnectivityManager {
		return NetworkUtils.bindProcessToNetworkForHostResolution(
		network == null ? NETID_UNSET : network.netId);
		}

		/**
		* Device is not restricting metered network activity while application is running on
		* background.
		*/
		public static final int RESTRICT_BACKGROUND_STATUS_DISABLED = 1;

		/**
		* Device is restricting metered network activity while application is running on background,
		* but application is allowed to bypass it.
		* <p>
		* In this state, application should take action to mitigate metered network access.
		* For example, a music streaming application should switch to a low-bandwidth bitrate.
		*/
		public static final int RESTRICT_BACKGROUND_STATUS_WHITELISTED = 2;

		/**
		* Device is restricting metered network activity while application is running on background.
		* In this state, application should not try to use the network while running on background,
		* because it would be denied.
		*/
		public static final int RESTRICT_BACKGROUND_STATUS_ENABLED = 3;

		@IntDef(flag = false, value = {
		RESTRICT_BACKGROUND_STATUS_DISABLED,
		RESTRICT_BACKGROUND_STATUS_WHITELISTED,
		RESTRICT_BACKGROUND_STATUS_ENABLED,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface RestrictBackgroundStatus {
		}

		private INetworkPolicyManager getNetworkPolicyManager() {
		synchronized (this) {
		if (mNPManager != null) {
		return mNPManager;
		}
		mNPManager = INetworkPolicyManager.Stub.asInterface(ServiceManager
		.getService(Context.NETWORK_POLICY_SERVICE));
		return mNPManager;
		}
		}

		/**
		* Determines if the calling application is subject to metered network restrictions while
		* running on background.
		*/
		public @RestrictBackgroundStatus int getRestrictBackgroundStatus() {
		try {
		return getNetworkPolicyManager().getRestrictBackgroundByCaller();
		} catch (RemoteException e) {
		return RESTRICT_BACKGROUND_STATUS_DISABLED;
		}
		}
		}

core/java/android/net/INetworkPolicyManager.aidl

+6 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,12 @@ interface INetworkPolicyManager {
		void addRestrictBackgroundWhitelistedUid(int uid);
		void removeRestrictBackgroundWhitelistedUid(int uid);
		int[] getRestrictBackgroundWhitelistedUids();
		/** Gets the restrict background status based on the caller's UID:
		1 - disabled
		2 - whitelisted
		3 - enabled
		*/
		int getRestrictBackgroundByCaller();

		void setDeviceIdleMode(boolean enabled);