commit 69f08bacd380ca2001f7bdfce8ad1b06f737b937
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 23 20:36:59 2025 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 23 20:36:59 2025 -0700
tree 7b294df8213b9da037500cf2fea22bff6a5345d0
parent 2dbaebfae22a8c95f16f1887c04ef13c745ef3b4
parent ac7b92dea60aea4344746b8f9b4eea7fd762ba3e

Merge cherrypicks of ['googleplex-android-review.googlesource.com/31944104'] into udc-platform-release.

Change-Id: Ida6b225296d30f12316d5de86e63d2716cead600

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 a12f3cd..8abe564 100755
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -7487,6 +7487,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),