joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Enable REQUEST_RESTRICTED_WIFI and CARRIER_SERVICE_CHANGED_USE_CALLBACK by default with kill switch

Browse source 
Bug: 416044405

Test: atest ConnectivityManagerTest
      atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.ConnectivityServiceTest
Change-Id: I1b67c00ce3d4054414ce9c538ec4d7b9a55b4302
Flag: com.android.net.flags.request_restricted_wifi
This commit is contained in:
Ying Xu 2025-05-09 08:43:18 -07:00
commit 7e4e0952f8
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
service/src/com/android/server/ConnectivityService.java
View file

@ -1966,7 +1966,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mAppOpsManager = (AppOpsManager) mContext.getSystemService(Context.APP_OPS_SERVICE);
mLocationPermissionChecker = mDeps.makeLocationPermissionChecker(mContext);
mRequestRestrictedWifiEnabled = mDeps.isAtLeastU()
&& mDeps.isFeatureEnabled(context, REQUEST_RESTRICTED_WIFI);
&& mDeps.isFeatureNotChickenedOut(context, REQUEST_RESTRICTED_WIFI);
mBackgroundFirewallChainEnabled = mDeps.isAtLeastV() && mDeps.isFeatureNotChickenedOut(
context, ConnectivityFlags.BACKGROUND_FIREWALL_CHAIN);
mUseDeclaredMethodsForCallbacksEnabled =

8
service/src/com/android/server/connectivity/CarrierPrivilegeAuthenticator.java
View file

@ -97,7 +97,7 @@ public class CarrierPrivilegeAuthenticator {
mContext = c;
mTelephonyManager = t;
mTelephonyManagerShim = telephonyManagerShim;
mUseCallbacksForServiceChanged = deps.isFeatureEnabled(
mUseCallbacksForServiceChanged = deps.isFeatureNotChickenedOut(
c, CARRIER_SERVICE_CHANGED_USE_CALLBACK);
mRequestRestrictedWifiEnabled = requestRestrictedWifiEnabled;
mListener = listener;
@ -159,10 +159,10 @@ public class CarrierPrivilegeAuthenticator {
}
/**
* @see DeviceConfigUtils#isTetheringFeatureEnabled
* @see DeviceConfigUtils#isTetheringFeatureNotChickenedOut
*/
public boolean isFeatureEnabled(Context context, String name) {
return DeviceConfigUtils.isTetheringFeatureEnabled(context, name);
public boolean isFeatureNotChickenedOut(Context context, String name) {
return DeviceConfigUtils.isTetheringFeatureNotChickenedOut(context, name);
}
}

3
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View file

@ -2183,8 +2183,6 @@ public class ConnectivityServiceTest {
public boolean isFeatureEnabled(Context context, String name) {
switch (name) {
case ConnectivityFlags.NO_REMATCH_ALL_REQUESTS_ON_REGISTER:
case ConnectivityFlags.CARRIER_SERVICE_CHANGED_USE_CALLBACK:
case ConnectivityFlags.REQUEST_RESTRICTED_WIFI:
case ConnectivityFlags.USE_DECLARED_METHODS_FOR_CALLBACKS:
case ConnectivityFlags.QUEUE_CALLBACKS_FOR_FROZEN_APPS:
case ConnectivityFlags.BACKGROUND_FIREWALL_CHAIN:
@ -2205,6 +2203,7 @@ public class ConnectivityServiceTest {
case ConnectivityFlags.INGRESS_TO_VPN_ADDRESS_FILTERING:
case ConnectivityFlags.BACKGROUND_FIREWALL_CHAIN:
case ConnectivityFlags.DELAY_DESTROY_SOCKETS:
case ConnectivityFlags.REQUEST_RESTRICTED_WIFI:
case ConnectivityFlags.USE_DECLARED_METHODS_FOR_CALLBACKS:
case ConnectivityFlags.QUEUE_CALLBACKS_FOR_FROZEN_APPS:
case ConnectivityFlags.QUEUE_NETWORK_AGENT_EVENTS_IN_SYSTEM_SERVER:

2
tests/unit/java/com/android/server/connectivity/CarrierPrivilegeAuthenticatorTest.java
View file

@ -141,7 +141,7 @@ public class CarrierPrivilegeAuthenticatorTest {
mHandlerThread = new HandlerThread(CarrierPrivilegeAuthenticatorTest.class.getSimpleName());
mUseCallbacks = useCallbacks;
final Dependencies deps = mock(Dependencies.class);
doReturn(useCallbacks).when(deps).isFeatureEnabled(any() /* context */,
doReturn(useCallbacks).when(deps).isFeatureNotChickenedOut(any() /* context */,
eq(CARRIER_SERVICE_CHANGED_USE_CALLBACK));
doReturn(mHandlerThread).when(deps).makeHandlerThread();
doReturn(SUBSCRIPTION_COUNT).when(mTelephonyManager).getActiveModemCount();