Merge "Add missing permission check to offerNetwork" into main

This commit is contained in:
Treehugger Robot 2025-01-06 15:07:04 -08:00 • committed by Gerrit Code Review
commit 1a76b01c08

View file

@ -8937,6 +8937,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
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),