Merge "Move some static methods from NPMS to NPM class." (983552d0) · Commits · e / os / android_frameworks_base

core/java/android/net/NetworkPolicyManager.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.net;
		import static android.content.pm.PackageManager.GET_SIGNATURES;
		import static android.net.NetworkPolicy.CYCLE_NONE;

		import android.app.ActivityManager;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.PackageManager;
		@@ -381,4 +382,20 @@ public class NetworkPolicyManager {
		string.append(")");
		return string.toString();
		}

		/**
		* Returns true if {@param procState} is considered foreground and as such will be allowed
		* to access network when the device is idle or in battery saver mode. Otherwise, false.
		*/
		public static boolean isProcStateAllowedWhileIdleOrPowerSaveMode(int procState) {
		return procState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE;
		}

		/**
		* Returns true if {@param procState} is considered foreground and as such will be allowed
		* to access network when the device is in data saver mode. Otherwise, false.
		*/
		public static boolean isProcStateAllowedWhileOnRestrictBackground(int procState) {
		return procState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE;
		}
		}

+2 −8

Original line number	Diff line number	Diff line
		@@ -58,6 +58,8 @@ import static android.net.NetworkPolicyManager.RULE_REJECT_ALL;
		import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
		import static android.net.NetworkPolicyManager.RULE_TEMPORARY_ALLOW_METERED;
		import static android.net.NetworkPolicyManager.computeLastCycleBoundary;
		import static android.net.NetworkPolicyManager.isProcStateAllowedWhileIdleOrPowerSaveMode;
		import static android.net.NetworkPolicyManager.isProcStateAllowedWhileOnRestrictBackground;
		import static android.net.NetworkPolicyManager.uidPoliciesToString;
		import static android.net.NetworkPolicyManager.uidRulesToString;
		import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER;
		@@ -2527,14 +2529,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		}

		static boolean isProcStateAllowedWhileIdleOrPowerSaveMode(int procState) {
		return procState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE;
		}

		static boolean isProcStateAllowedWhileOnRestrictBackground(int procState) {
		return procState <= ActivityManager.PROCESS_STATE_FOREGROUND_SERVICE;
		}

		void updateRulesForPowerSaveUL() {
		Trace.traceBegin(Trace.TRACE_TAG_NETWORK, "updateRulesForPowerSaveUL");
		try {