Merge "Replace NetworkPolicyManagerInternal#isUidRestrictedOnMeteredNetworks()" (ce1b5d00) · Commits · e / os / android_frameworks_base

core/java/android/net/INetworkPolicyManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -81,4 +81,5 @@ interface INetworkPolicyManager {
		void factoryReset(String subscriber);

		boolean isUidNetworkingBlocked(int uid, boolean meteredNetwork);
		boolean isUidRestrictedOnMeteredNetworks(int uid);
		}

core/java/android/net/NetworkPolicyManager.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -459,6 +459,22 @@ public class NetworkPolicyManager {
		}
		}

		/**
		* Check that the given uid is restricted from doing networking on metered networks.
		*
		* @param uid The target uid.
		* @return true if the given uid is restricted from doing networking on metered networks.
		*
		* @hide
		*/
		public boolean isUidRestrictedOnMeteredNetworks(int uid) {
		try {
		return mService.isUidRestrictedOnMeteredNetworks(uid);
		} catch (RemoteException e) {
		throw e.rethrowFromSystemServer();
		}
		}

		/**
		* Get multipath preference for the given network.
		*/

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -5714,10 +5714,15 @@ public class ConnectivityService extends IConnectivityManager.Stub
		// Policy already enforced.
		return;
		}
		if (mPolicyManagerInternal.isUidRestrictedOnMeteredNetworks(uid)) {
		final long ident = Binder.clearCallingIdentity();
		try {
		if (mPolicyManager.isUidRestrictedOnMeteredNetworks(uid)) {
		// If UID is restricted, don't allow them to bring up metered APNs.
		networkCapabilities.addCapability(NET_CAPABILITY_NOT_METERED);
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}
		}

		@Override

services/core/java/com/android/server/net/NetworkPolicyManagerInternal.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -38,11 +38,6 @@ public abstract class NetworkPolicyManagerInternal {
		*/
		public abstract void resetUserState(int userId);

		/**
		* @return true if the given uid is restricted from doing networking on metered networks.
		*/
		public abstract boolean isUidRestrictedOnMeteredNetworks(int uid);

		/**
		* Figure out if networking is blocked for a given set of conditions.
		*

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+18 −17

Original line number	Diff line number	Diff line
		@@ -5361,7 +5361,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		public boolean isUidNetworkingBlocked(int uid, boolean isNetworkMetered) {
		final long startTime = mStatLogger.getTime();

		enforceAnyPermissionOf(OBSERVE_NETWORK_POLICY, PERMISSION_MAINLINE_NETWORK_STACK);
		mContext.enforceCallingOrSelfPermission(OBSERVE_NETWORK_POLICY, TAG);
		final int uidRules;
		final boolean isBackgroundRestricted;
		synchronized (mUidRulesFirstLock) {
		@@ -5376,6 +5376,23 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		return ret;
		}

		@Override
		public boolean isUidRestrictedOnMeteredNetworks(int uid) {
		mContext.enforceCallingOrSelfPermission(OBSERVE_NETWORK_POLICY, TAG);
		final int uidRules;
		final boolean isBackgroundRestricted;
		synchronized (mUidRulesFirstLock) {
		uidRules = mUidRules.get(uid, RULE_ALLOW_ALL);
		isBackgroundRestricted = mRestrictBackground;
		}
		//TODO(b/177490332): The logic here might not be correct because it doesn't consider
		// RULE_REJECT_METERED condition. And it could be replaced by
		// isUidNetworkingBlockedInternal().
		return isBackgroundRestricted
		&& !hasRule(uidRules, RULE_ALLOW_METERED)
		&& !hasRule(uidRules, RULE_TEMPORARY_ALLOW_METERED);
		}

		private static boolean isSystem(int uid) {
		return uid < Process.FIRST_APPLICATION_UID;
		}
		@@ -5444,22 +5461,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		}

		/**
		* @return true if the given uid is restricted from doing networking on metered networks.
		*/
		@Override
		public boolean isUidRestrictedOnMeteredNetworks(int uid) {
		final int uidRules;
		final boolean isBackgroundRestricted;
		synchronized (mUidRulesFirstLock) {
		uidRules = mUidRules.get(uid, RULE_ALLOW_ALL);
		isBackgroundRestricted = mRestrictBackground;
		}
		return isBackgroundRestricted
		&& !hasRule(uidRules, RULE_ALLOW_METERED)
		&& !hasRule(uidRules, RULE_TEMPORARY_ALLOW_METERED);
		}

		@Override
		public void onTempPowerSaveWhitelistChange(int appId, boolean added) {
		synchronized (mUidRulesFirstLock) {