joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Replace NPMI#isUidNetworkingBlocked()" am: 9113cf2872 am: c48b6bb362

Browse source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536313

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c9f22befc69af4b4dc796d7fb432314cf8e3c3f
This commit is contained in:
Paul Hu 2021-02-05 07:43:12 +00:00 • committed by Automerger Merge Worker
commit b3cd3bb875
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
services/core/java/com/android/server/ConnectivityService.java
View file

@ -2142,8 +2142,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
private boolean isUidBlockedByRules(int uid, int uidRules, boolean isNetworkMetered, private boolean isUidBlockedByRules(int uid, int uidRules, boolean isNetworkMetered,
boolean isBackgroundRestricted) { boolean isBackgroundRestricted) {
return NetworkPolicyManagerInternal.isUidNetworkingBlocked(uid, uidRules, return mPolicyManager.checkUidNetworkingBlocked(uid, uidRules, isNetworkMetered,
isNetworkMetered, isBackgroundRestricted); isBackgroundRestricted);
} }
/** /**

20
tests/net/java/com/android/server/ConnectivityServiceTest.java
View file

@ -1262,22 +1262,28 @@ public class ConnectivityServiceTest {
} }
} }
private void updateUidNetworkingBlocked() { private void mockUidNetworkingBlocked() {
doAnswer(i -> NetworkPolicyManagerInternal.isUidNetworkingBlocked( doAnswer(i -> mContext.getSystemService(NetworkPolicyManager.class)
i.getArgument(0) /* uid */, mUidRules, i.getArgument(1) /* metered */, .checkUidNetworkingBlocked(i.getArgument(0) /* uid */, mUidRules,
mRestrictBackground) i.getArgument(1) /* metered */, mRestrictBackground)
).when(mNetworkPolicyManager).isUidNetworkingBlocked(anyInt(), anyBoolean()); ).when(mNetworkPolicyManager).isUidNetworkingBlocked(anyInt(), anyBoolean());
doAnswer(inv -> mContext.getSystemService(NetworkPolicyManager.class)
.checkUidNetworkingBlocked(inv.getArgument(0) /* uid */,
inv.getArgument(1) /* uidRules */,
inv.getArgument(2) /* isNetworkMetered */,
inv.getArgument(3) /* isBackgroundRestricted */)
).when(mNetworkPolicyManager).checkUidNetworkingBlocked(
anyInt(), anyInt(), anyBoolean(), anyBoolean());
} }
private void setUidRulesChanged(int uidRules) throws RemoteException { private void setUidRulesChanged(int uidRules) throws RemoteException {
mUidRules = uidRules; mUidRules = uidRules;
updateUidNetworkingBlocked();
mPolicyListener.onUidRulesChanged(Process.myUid(), mUidRules); mPolicyListener.onUidRulesChanged(Process.myUid(), mUidRules);
} }
private void setRestrictBackgroundChanged(boolean restrictBackground) throws RemoteException { private void setRestrictBackgroundChanged(boolean restrictBackground) throws RemoteException {
mRestrictBackground = restrictBackground; mRestrictBackground = restrictBackground;
updateUidNetworkingBlocked();
mPolicyListener.onRestrictBackgroundChanged(mRestrictBackground); mPolicyListener.onRestrictBackgroundChanged(mRestrictBackground);
} }
@ -6809,6 +6815,7 @@ public class ConnectivityServiceTest {
.addTransportType(TRANSPORT_CELLULAR) .addTransportType(TRANSPORT_CELLULAR)
.build(); .build();
mCm.registerNetworkCallback(cellRequest, cellNetworkCallback); mCm.registerNetworkCallback(cellRequest, cellNetworkCallback);
mockUidNetworkingBlocked();
mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR); mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);
mCellNetworkAgent.connect(true); mCellNetworkAgent.connect(true);
@ -6891,6 +6898,7 @@ public class ConnectivityServiceTest {
public void testNetworkBlockedStatusBeforeAndAfterConnect() throws Exception { public void testNetworkBlockedStatusBeforeAndAfterConnect() throws Exception {
final TestNetworkCallback defaultCallback = new TestNetworkCallback(); final TestNetworkCallback defaultCallback = new TestNetworkCallback();
mCm.registerDefaultNetworkCallback(defaultCallback); mCm.registerDefaultNetworkCallback(defaultCallback);
mockUidNetworkingBlocked();
// No Networkcallbacks invoked before any network is active. // No Networkcallbacks invoked before any network is active.
setUidRulesChanged(RULE_REJECT_ALL); setUidRulesChanged(RULE_REJECT_ALL);