| commit | 465fbbe624bd56287f8c90a2432c49dfcbbe682a | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Mar 18 10:00:45 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 18 10:00:45 2024 +0000 |
| tree | 5d153734fe9f3ff7646b2567a31d4d4976f345ce | |
| parent | 414a563ae5c5c2a21dc7e5e166413d3b7cad370c [diff] | |
| parent | 41b9811422589475eec25e876a1fe03596f37345 [diff] |
Merge "Throw if isUidNetworkingBlocked is called below U" into main am: 5784191a76 am: 41b9811422 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3002349 Change-Id: I3ccbce4564c6e0b69f7385836d33cf1a524ad6d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java index 915ec52..9e42d2b 100644 --- a/framework/src/android/net/ConnectivityManager.java +++ b/framework/src/android/net/ConnectivityManager.java
@@ -6284,7 +6284,8 @@ @RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public boolean isUidNetworkingBlocked(int uid, boolean isNetworkMetered) { if (!SdkLevel.isAtLeastU()) { - Log.wtf(TAG, "isUidNetworkingBlocked is not supported on pre-U devices"); + throw new IllegalStateException( + "isUidNetworkingBlocked is not supported on pre-U devices"); } final BpfNetMapsReader reader = BpfNetMapsReader.getInstance(); // Note that before V, the data saver status in bpf is written by ConnectivityService