Merge "Clear caller identity before updating restrictions" into main (a5d896cd) · Commits · e / os / android_frameworks_base

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

+20 −10

Original line number	Diff line number	Diff line
		@@ -3100,12 +3100,17 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}

		synchronized (mUidRulesFirstLock) {
		final long token = Binder.clearCallingIdentity();
		try {
		final int oldPolicy = mUidPolicy.get(uid, POLICY_NONE);
		policy \|= oldPolicy;
		if (oldPolicy != policy) {
		setUidPolicyUncheckedUL(uid, oldPolicy, policy, true);
		mLogger.uidPolicyChanged(uid, oldPolicy, policy);
		}
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		}

		@@ -3119,12 +3124,17 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}

		synchronized (mUidRulesFirstLock) {
		final long token = Binder.clearCallingIdentity();
		try {
		final int oldPolicy = mUidPolicy.get(uid, POLICY_NONE);
		policy = oldPolicy & ~policy;
		if (oldPolicy != policy) {
		setUidPolicyUncheckedUL(uid, oldPolicy, policy, true);
		mLogger.uidPolicyChanged(uid, oldPolicy, policy);
		}
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		}