From 6d5643f87edce35f21589979d46a22190c8d418c Mon Sep 17 00:00:00 2001 From: paulhu Date: Wed, 31 Mar 2021 15:43:19 +0800 Subject: [PATCH] Remove unused method checkUidNetworkingBlocked aosp/1612823 removed the usage from CS, no one is using checkUidNetworkingBlocked() now. Thus, remove it from NetworkPolicyManager, AIDL and NetworkPolicyManagerService. Bug: 180084343 Test: atest FrameworksNetTests Test: atest CtsNetTestCases Test: atest CtsHostsideNetworkTests Test: atest FrameworksCoreTests:NetworkPolicyManagerTest Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest Change-Id: I632efa4b775a0238bb912690d48e766597e5e623 --- .../android/net/INetworkPolicyManager.aidl | 1 - .../android/net/NetworkPolicyManager.java | 25 ------- .../net/NetworkPolicyManagerService.java | 11 --- .../net/NetworkPolicyManagerServiceTest.java | 70 ------------------- 4 files changed, 107 deletions(-) diff --git a/core/java/android/net/INetworkPolicyManager.aidl b/core/java/android/net/INetworkPolicyManager.aidl index 171c6a2c6a198..f50aa991a67c8 100644 --- a/core/java/android/net/INetworkPolicyManager.aidl +++ b/core/java/android/net/INetworkPolicyManager.aidl @@ -78,5 +78,4 @@ interface INetworkPolicyManager { boolean isUidNetworkingBlocked(int uid, boolean meteredNetwork); boolean isUidRestrictedOnMeteredNetworks(int uid); - boolean checkUidNetworkingBlocked(int uid, int uidRules, boolean isNetworkMetered, boolean isBackgroundRestricted); } diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index 39713297e7626..c2f9948317dd5 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -565,31 +565,6 @@ public class NetworkPolicyManager { } } - /** - * Figure out if networking is blocked for a given set of conditions. - * - * This is used by ConnectivityService via passing stale copies of conditions, so it must not - * take any locks. - * - * @param uid The target uid. - * @param uidRules The uid rules which are obtained from NetworkPolicyManagerService. - * @param isNetworkMetered True if the network is metered. - * @param isBackgroundRestricted True if data saver is enabled. - * - * @return true if networking is blocked for the UID under the specified conditions. - * - * @hide - */ - public boolean checkUidNetworkingBlocked(int uid, int uidRules, - boolean isNetworkMetered, boolean isBackgroundRestricted) { - try { - return mService.checkUidNetworkingBlocked(uid, uidRules, isNetworkMetered, - isBackgroundRestricted); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - } - /** * Check that the given uid is restricted from doing networking on metered networks. * diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 06a09ae2a190f..a6c165624c821 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -5556,17 +5556,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { return ret; } - @Override - public boolean checkUidNetworkingBlocked(int uid, int uidRules, - boolean isNetworkMetered, boolean isBackgroundRestricted) { - mContext.enforceCallingOrSelfPermission(OBSERVE_NETWORK_POLICY, TAG); - // Log of invoking this function is disabled because it will be called very frequently. And - // metrics are unlikely needed on this method because the callers are external and this - // method doesn't take any locks or perform expensive operations. - return isUidNetworkingBlockedInternal(uid, uidRules, isNetworkMetered, - isBackgroundRestricted, null); - } - @Override public boolean isUidRestrictedOnMeteredNetworks(int uid) { mContext.enforceCallingOrSelfPermission(OBSERVE_NETWORK_POLICY, TAG); diff --git a/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java index fb01ff6e16c64..bdcdea9238e1e 100644 --- a/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java @@ -33,12 +33,6 @@ import static android.net.NetworkPolicyManager.FIREWALL_RULE_DEFAULT; import static android.net.NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND; import static android.net.NetworkPolicyManager.POLICY_NONE; import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; -import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL; -import static android.net.NetworkPolicyManager.RULE_ALLOW_METERED; -import static android.net.NetworkPolicyManager.RULE_NONE; -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.uidPoliciesToString; import static android.net.NetworkPolicyManager.uidRulesToString; import static android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK; @@ -49,7 +43,6 @@ import static android.net.NetworkStats.TAG_NONE; import static android.net.NetworkTemplate.buildTemplateMobileAll; import static android.net.NetworkTemplate.buildTemplateWifi; import static android.net.TrafficStats.MB_IN_BYTES; -import static android.os.Process.SYSTEM_UID; import static android.telephony.CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED; import static android.telephony.CarrierConfigManager.DATA_CYCLE_THRESHOLD_DISABLED; import static android.telephony.CarrierConfigManager.DATA_CYCLE_USE_PLATFORM_DEFAULT; @@ -141,7 +134,6 @@ import android.text.TextUtils; import android.util.ArrayMap; import android.util.DataUnit; import android.util.Log; -import android.util.Pair; import android.util.Range; import android.util.RecurrenceRule; @@ -1826,68 +1818,6 @@ public class NetworkPolicyManagerServiceTest { verify(mStatsService).setStatsProviderLimitAsync(TEST_IFACE, 10000L - 4999L - 1999L); } - /** - * Exhaustively test checkUidNetworkingBlocked to output the expected results based on external - * conditions. - */ - @Test - public void testCheckUidNetworkingBlocked() { - final ArrayList> expectedBlockedStates = new ArrayList<>(); - - // Metered network. Data saver on. - expectedBlockedStates.add(new Pair<>(true, RULE_NONE)); - expectedBlockedStates.add(new Pair<>(false, RULE_ALLOW_METERED)); - expectedBlockedStates.add(new Pair<>(false, RULE_TEMPORARY_ALLOW_METERED)); - expectedBlockedStates.add(new Pair<>(true, RULE_REJECT_METERED)); - expectedBlockedStates.add(new Pair<>(true, RULE_ALLOW_ALL)); - expectedBlockedStates.add(new Pair<>(true, RULE_REJECT_ALL)); - verifyNetworkBlockedState( - true /* metered */, true /* backgroundRestricted */, expectedBlockedStates); - expectedBlockedStates.clear(); - - // Metered network. Data saver off. - expectedBlockedStates.add(new Pair<>(false, RULE_NONE)); - expectedBlockedStates.add(new Pair<>(false, RULE_ALLOW_METERED)); - expectedBlockedStates.add(new Pair<>(false, RULE_TEMPORARY_ALLOW_METERED)); - expectedBlockedStates.add(new Pair<>(true, RULE_REJECT_METERED)); - expectedBlockedStates.add(new Pair<>(false, RULE_ALLOW_ALL)); - expectedBlockedStates.add(new Pair<>(true, RULE_REJECT_ALL)); - verifyNetworkBlockedState( - true /* metered */, false /* backgroundRestricted */, expectedBlockedStates); - expectedBlockedStates.clear(); - - // Non-metered network. Data saver on. - expectedBlockedStates.add(new Pair<>(false, RULE_NONE)); - expectedBlockedStates.add(new Pair<>(false, RULE_ALLOW_METERED)); - expectedBlockedStates.add(new Pair<>(false, RULE_TEMPORARY_ALLOW_METERED)); - expectedBlockedStates.add(new Pair<>(false, RULE_REJECT_METERED)); - expectedBlockedStates.add(new Pair<>(false, RULE_ALLOW_ALL)); - expectedBlockedStates.add(new Pair<>(true, RULE_REJECT_ALL)); - verifyNetworkBlockedState( - false /* metered */, true /* backgroundRestricted */, expectedBlockedStates); - - // Non-metered network. Data saver off. The result is the same as previous case since - // the network is blocked only for RULE_REJECT_ALL regardless of data saver. - verifyNetworkBlockedState( - false /* metered */, false /* backgroundRestricted */, expectedBlockedStates); - expectedBlockedStates.clear(); - } - - private void verifyNetworkBlockedState(boolean metered, boolean backgroundRestricted, - ArrayList> expectedBlockedStateForRules) { - - for (Pair pair : expectedBlockedStateForRules) { - final boolean expectedResult = pair.first; - final int rule = pair.second; - assertEquals(formatBlockedStateError(UID_A, rule, metered, backgroundRestricted), - expectedResult, mService.checkUidNetworkingBlocked(UID_A, rule, - metered, backgroundRestricted)); - assertFalse(formatBlockedStateError(SYSTEM_UID, rule, metered, backgroundRestricted), - mService.checkUidNetworkingBlocked(SYSTEM_UID, rule, metered, - backgroundRestricted)); - } - } - private void enableRestrictedMode(boolean enable) throws Exception { mService.mRestrictedNetworkingMode = enable; mService.updateRestrictedModeAllowlistUL();