| commit | 41b9811422589475eec25e876a1fe03596f37345 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Mar 18 09:44:14 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 18 09:44:14 2024 +0000 |
| tree | a20eed837feee75a15ebfe0f89a22eaf8f5aa6f9 | |
| parent | 124a5ae8750257fc0e4cfddd059eee067fa8e163 [diff] | |
| parent | 5784191a761b49405dbfac2ad53bf7d336fa9d8f [diff] |
Merge "Throw if isUidNetworkingBlocked is called below U" into main am: 5784191a76 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3002349 Change-Id: If1ca7722b358693136922a6f22b001f09886497b 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