Merge "Update language to comply with Android's inclusive language guidance"... (c07982cd) · Commits · e / os / android_frameworks_base

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

+4 −4

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

+28 −28

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

+21 −21

Original line number	Original line	Diff line number	Diff line
	@@ -154,13 +154,13 @@ class NetworkPolicyManagerShellCommand extends ShellCommand {
	}		}
	switch(type) {		switch(type) {
	case "app-idle-whitelist":		case "app-idle-whitelist":
	return listAppIdleWhitelist();		return listAppIdleAllowlist();
	case "wifi-networks":		case "wifi-networks":
	return listWifiNetworks();		return listWifiNetworks();
	case "restrict-background-whitelist":		case "restrict-background-whitelist":
	return listRestrictBackgroundWhitelist();		return listRestrictBackgroundAllowlist();
	case "restrict-background-blacklist":		case "restrict-background-blacklist":
	return listRestrictBackgroundBlacklist();		return listRestrictBackgroundDenylist();
	}		}
	pw.println("Error: unknown list type '" + type + "'");		pw.println("Error: unknown list type '" + type + "'");
	return -1;		return -1;
	@@ -175,11 +175,11 @@ class NetworkPolicyManagerShellCommand extends ShellCommand {
	}		}
	switch(type) {		switch(type) {
	case "restrict-background-whitelist":		case "restrict-background-whitelist":
	return addRestrictBackgroundWhitelist();		return addRestrictBackgroundAllowlist();
	case "restrict-background-blacklist":		case "restrict-background-blacklist":
	return addRestrictBackgroundBlacklist();		return addRestrictBackgroundDenylist();
	case "app-idle-whitelist":		case "app-idle-whitelist":
	return addAppIdleWhitelist();		return addAppIdleAllowlist();
	}		}
	pw.println("Error: unknown add type '" + type + "'");		pw.println("Error: unknown add type '" + type + "'");
	return -1;		return -1;
	@@ -194,11 +194,11 @@ class NetworkPolicyManagerShellCommand extends ShellCommand {
	}		}
	switch(type) {		switch(type) {
	case "restrict-background-whitelist":		case "restrict-background-whitelist":
	return removeRestrictBackgroundWhitelist();		return removeRestrictBackgroundAllowlist();
	case "restrict-background-blacklist":		case "restrict-background-blacklist":
	return removeRestrictBackgroundBlacklist();		return removeRestrictBackgroundDenylist();
	case "app-idle-whitelist":		case "app-idle-whitelist":
	return removeAppIdleWhitelist();		return removeAppIdleAllowlist();
	}		}
	pw.println("Error: unknown remove type '" + type + "'");		pw.println("Error: unknown remove type '" + type + "'");
	return -1;		return -1;
	@@ -241,17 +241,17 @@ class NetworkPolicyManagerShellCommand extends ShellCommand {
	return 0;		return 0;
	}		}

	private int listRestrictBackgroundWhitelist() throws RemoteException {		private int listRestrictBackgroundAllowlist() throws RemoteException {
	return listUidPolicies("Restrict background whitelisted UIDs",		return listUidPolicies("Restrict background whitelisted UIDs",
	POLICY_ALLOW_METERED_BACKGROUND);		POLICY_ALLOW_METERED_BACKGROUND);
	}		}

	private int listRestrictBackgroundBlacklist() throws RemoteException {		private int listRestrictBackgroundDenylist() throws RemoteException {
	return listUidPolicies("Restrict background blacklisted UIDs",		return listUidPolicies("Restrict background blacklisted UIDs",
	POLICY_REJECT_METERED_BACKGROUND);		POLICY_REJECT_METERED_BACKGROUND);
	}		}

	private int listAppIdleWhitelist() throws RemoteException {		private int listAppIdleAllowlist() throws RemoteException {
	final PrintWriter pw = getOutPrintWriter();		final PrintWriter pw = getOutPrintWriter();
	final int[] uids = mInterface.getAppIdleWhitelist();		final int[] uids = mInterface.getAppIdleWhitelist();
	return listUidList("App Idle whitelisted UIDs", uids);		return listUidList("App Idle whitelisted UIDs", uids);
	@@ -311,23 +311,23 @@ class NetworkPolicyManagerShellCommand extends ShellCommand {
	return 0;		return 0;
	}		}

	private int addRestrictBackgroundWhitelist() throws RemoteException {		private int addRestrictBackgroundAllowlist() throws RemoteException {
	return setUidPolicy(POLICY_ALLOW_METERED_BACKGROUND);		return setUidPolicy(POLICY_ALLOW_METERED_BACKGROUND);
	}		}

	private int removeRestrictBackgroundWhitelist() throws RemoteException {		private int removeRestrictBackgroundAllowlist() throws RemoteException {
	return resetUidPolicy("not whitelisted", POLICY_ALLOW_METERED_BACKGROUND);		return resetUidPolicy("not whitelisted", POLICY_ALLOW_METERED_BACKGROUND);
	}		}

	private int addRestrictBackgroundBlacklist() throws RemoteException {		private int addRestrictBackgroundDenylist() throws RemoteException {
	return setUidPolicy(POLICY_REJECT_METERED_BACKGROUND);		return setUidPolicy(POLICY_REJECT_METERED_BACKGROUND);
	}		}

	private int removeRestrictBackgroundBlacklist() throws RemoteException {		private int removeRestrictBackgroundDenylist() throws RemoteException {
	return resetUidPolicy("not blacklisted", POLICY_REJECT_METERED_BACKGROUND);		return resetUidPolicy("not blacklisted", POLICY_REJECT_METERED_BACKGROUND);
	}		}

	private int setAppIdleWhitelist(boolean isWhitelisted) {		private int setAppIdleAllowlist(boolean isWhitelisted) {
	final int uid = getUidFromNextArg();		final int uid = getUidFromNextArg();
	if (uid < 0) {		if (uid < 0) {
	return uid;		return uid;
	@@ -336,12 +336,12 @@ class NetworkPolicyManagerShellCommand extends ShellCommand {
	return 0;		return 0;
	}		}

	private int addAppIdleWhitelist() throws RemoteException {		private int addAppIdleAllowlist() throws RemoteException {
	return setAppIdleWhitelist(true);		return setAppIdleAllowlist(true);
	}		}

	private int removeAppIdleWhitelist() throws RemoteException {		private int removeAppIdleAllowlist() throws RemoteException {
	return setAppIdleWhitelist(false);		return setAppIdleAllowlist(false);
	}		}

	private int listWifiNetworks() {		private int listWifiNetworks() {

Original line number	Original line	Diff line number	Diff line
	@@ -338,8 +338,8 @@ public class NetworkPolicyLogger {
	return "App idle state of uid " + uid + ": " + idle;		return "App idle state of uid " + uid + ": " + idle;
	}		}

	private static String getAppIdleWlChangedLog(int uid, boolean isWhitelisted) {		private static String getAppIdleWlChangedLog(int uid, boolean isAllowlisted) {
	return "App idle whitelist state of uid " + uid + ": " + isWhitelisted;		return "App idle whitelist state of uid " + uid + ": " + isAllowlisted;
	}		}

	private static String getParoleStateChanged(boolean paroleOn) {		private static String getParoleStateChanged(boolean paroleOn) {
	@@ -519,14 +519,14 @@ public class NetworkPolicyLogger {
	data.timeStamp = System.currentTimeMillis();		data.timeStamp = System.currentTimeMillis();
	}		}

	public void appIdleWlChanged(int uid, boolean isWhitelisted) {		public void appIdleWlChanged(int uid, boolean isAllowlisted) {
	final Data data = getNextSlot();		final Data data = getNextSlot();
	if (data == null) return;		if (data == null) return;

	data.reset();		data.reset();
	data.type = EVENT_APP_IDLE_WL_CHANGED;		data.type = EVENT_APP_IDLE_WL_CHANGED;
	data.ifield1 = uid;		data.ifield1 = uid;
	data.bfield1 = isWhitelisted;		data.bfield1 = isAllowlisted;
	data.timeStamp = System.currentTimeMillis();		data.timeStamp = System.currentTimeMillis();
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -364,7 +364,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	private static final String TAG_NETWORK_POLICY = "network-policy";		private static final String TAG_NETWORK_POLICY = "network-policy";
	private static final String TAG_UID_POLICY = "uid-policy";		private static final String TAG_UID_POLICY = "uid-policy";
	private static final String TAG_APP_POLICY = "app-policy";		private static final String TAG_APP_POLICY = "app-policy";
	private static final String TAG_WHITELIST = "whitelist";		private static final String TAG_ALLOWLIST = "whitelist";
	private static final String TAG_RESTRICT_BACKGROUND = "restrict-background";		private static final String TAG_RESTRICT_BACKGROUND = "restrict-background";
	private static final String TAG_REVOKED_RESTRICT_BACKGROUND = "revoked-restrict-background";		private static final String TAG_REVOKED_RESTRICT_BACKGROUND = "revoked-restrict-background";
	private static final String TAG_XML_UTILS_INT_ARRAY = "int-array";		private static final String TAG_XML_UTILS_INT_ARRAY = "int-array";
	@@ -858,7 +858,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	}		}

	@GuardedBy("mUidRulesFirstLock")		@GuardedBy("mUidRulesFirstLock")
	private void updatePowerSaveWhitelistUL() {		private void updatePowerSaveAllowlistUL() {
	int[] whitelist = mPowerWhitelistManager.getWhitelistedAppIds(/* includingIdle */ false);		int[] whitelist = mPowerWhitelistManager.getWhitelistedAppIds(/* includingIdle */ false);
	mPowerSaveWhitelistExceptIdleAppIds.clear();		mPowerSaveWhitelistExceptIdleAppIds.clear();
	for (int uid : whitelist) {		for (int uid : whitelist) {
	@@ -949,7 +949,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

	synchronized (mUidRulesFirstLock) {		synchronized (mUidRulesFirstLock) {
	synchronized (mNetworkPoliciesSecondLock) {		synchronized (mNetworkPoliciesSecondLock) {
	updatePowerSaveWhitelistUL();		updatePowerSaveAllowlistUL();
	mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);		mPowerManagerInternal = LocalServices.getService(PowerManagerInternal.class);
	mPowerManagerInternal.registerLowPowerModeObserver(		mPowerManagerInternal.registerLowPowerModeObserver(
	new PowerManagerInternal.LowPowerModeListener() {		new PowerManagerInternal.LowPowerModeListener() {
	@@ -1193,7 +1193,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	public void onReceive(Context context, Intent intent) {		public void onReceive(Context context, Intent intent) {
	// on background handler thread, and POWER_SAVE_WHITELIST_CHANGED is protected		// on background handler thread, and POWER_SAVE_WHITELIST_CHANGED is protected
	synchronized (mUidRulesFirstLock) {		synchronized (mUidRulesFirstLock) {
	updatePowerSaveWhitelistUL();		updatePowerSaveAllowlistUL();
	updateRulesForRestrictPowerUL();		updateRulesForRestrictPowerUL();
	updateRulesForAppIdleUL();		updateRulesForAppIdleUL();
	}		}
	@@ -2683,7 +2683,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
	} else {		} else {
	Slog.w(TAG, "unable to apply policy to UID " + uid + "; ignoring");		Slog.w(TAG, "unable to apply policy to UID " + uid + "; ignoring");
	}		}
	} else if (TAG_WHITELIST.equals(tag)) {		} else if (TAG_ALLOWLIST.equals(tag)) {
	insideAllowlist = true;		insideAllowlist = true;
	} else if (TAG_RESTRICT_BACKGROUND.equals(tag) && insideAllowlist) {		} else if (TAG_RESTRICT_BACKGROUND.equals(tag) && insideAllowlist) {
	final int uid = readIntAttribute(in, ATTR_UID);		final int uid = readIntAttribute(in, ATTR_UID);