commit 4effca009d3d50ee9e32e137c6748337d255d277
author Patrick Rohr <prohr@google.com> Wed Mar 19 09:26:50 2025 -0700
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 19 09:26:50 2025 -0700
tree 04ff6c4c43d9162ec4946b1de2ddcb7ce6d5cd7f
parent ae29875d61147cf7aa0cb1c9ce06f25bdfb4edb6
parent 27b011caf2edb02e550e1f8aa2eae3e2066d27b3

Add missing permission check to offerNetwork am: 27b011caf2

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/31944104

Change-Id: I1636db1282c717d615f16447106dac90e92d8ed1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

service/src/com/android/server/ConnectivityService.java

diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 1c9e0d9..648bfaf 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -8155,6 +8155,11 @@
         Objects.requireNonNull(score);
         Objects.requireNonNull(caps);
         Objects.requireNonNull(callback);
+        if (caps.hasTransport(TRANSPORT_TEST)) {
+            enforceAnyPermissionOf(mContext, Manifest.permission.MANAGE_TEST_NETWORKS);
+        } else {
+            enforceNetworkFactoryPermission();
+        }
         final boolean yieldToBadWiFi = caps.hasTransport(TRANSPORT_CELLULAR) && !avoidBadWifi();
         final NetworkOffer offer = new NetworkOffer(
                 FullScore.makeProspectiveScore(score, caps, yieldToBadWiFi),