Revert "Use bpf map based isUidNetworkingBlocked on V+"
This reverts commit 9b272fa53abf13b6ddc0e23ce424b7bdfae9381f.
Reason for revert: possible root cause of b/333340911.
Change-Id: Ic4923fd19db7e4704a3ef02d79644b47c271e18e
diff --git a/service/src/com/android/server/BpfNetMaps.java b/service/src/com/android/server/BpfNetMaps.java
index 42c1628..fc6d8c4 100644
--- a/service/src/com/android/server/BpfNetMaps.java
+++ b/service/src/com/android/server/BpfNetMaps.java
@@ -918,25 +918,6 @@
}
}
- /**
- * Return whether the network is blocked by firewall chains for the given uid.
- *
- * Note that {@link #getDataSaverEnabled()} has a latency before V.
- *
- * @param uid The target uid.
- * @param isNetworkMetered Whether the target network is metered.
- *
- * @return True if the network is blocked. Otherwise, false.
- * @throws ServiceSpecificException if the read fails.
- *
- * @hide
- */
- @RequiresApi(Build.VERSION_CODES.TIRAMISU)
- public boolean isUidNetworkingBlocked(final int uid, boolean isNetworkMetered) {
- return BpfNetMapsUtils.isUidNetworkingBlocked(uid, isNetworkMetered,
- sConfigurationMap, sUidOwnerMap, sDataSaverEnabledMap);
- }
-
/** Register callback for statsd to pull atom. */
@RequiresApi(Build.VERSION_CODES.TIRAMISU)
public void setPullAtomCallback(final Context context) {
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 005d617..123ad8f 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -2235,11 +2235,7 @@
final long ident = Binder.clearCallingIdentity();
try {
final boolean metered = nc == null ? true : nc.isMetered();
- if (mDeps.isAtLeastV()) {
- return mBpfNetMaps.isUidNetworkingBlocked(uid, metered);
- } else {
- return mPolicyManager.isUidNetworkingBlocked(uid, metered);
- }
+ return mPolicyManager.isUidNetworkingBlocked(uid, metered);
} finally {
Binder.restoreCallingIdentity(ident);
}
diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index 0bc04ad..f41d7b2 100755
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -1719,8 +1719,6 @@
private void mockUidNetworkingBlocked() {
doAnswer(i -> isUidBlocked(mBlockedReasons, i.getArgument(1))
).when(mNetworkPolicyManager).isUidNetworkingBlocked(anyInt(), anyBoolean());
- doAnswer(i -> isUidBlocked(mBlockedReasons, i.getArgument(1))
- ).when(mBpfNetMaps).isUidNetworkingBlocked(anyInt(), anyBoolean());
}
private boolean isUidBlocked(int blockedReasons, boolean meteredNetwork) {