LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove usage for deprecated ro.radio.noril

Browse Source 
The ro.radio.noril system properties is not used anymore. Tests
that require to check if device supports wifi but not telephony
should verify it via PackageManager.hasSystemFeature(). Also
remove the systemProperties mocking since the only need for the
mocking is removed.

Bug: 242647857
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Ie34e87394458e64a9363678a863d6d977834958f
This commit is contained in:
chiachangwang
2022-09-14 10:25:48 +08:00
parent 9e1675d38c
commit 4e8b49bee4
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -165,7 +165,6 @@ import android.os.MessageQueue;
import android.os.Process;
import android.os.ServiceManager;
import android.os.SystemClock;
import android.os.SystemProperties;
import android.os.UserHandle;
import android.os.VintfRuntimeInfo;
import android.platform.test.annotations.AppModeFull;
@@ -353,7 +352,8 @@ public class ConnectivityManagerTest {
// Get com.android.internal.R.array.networkAttributes
int resId = mContext.getResources().getIdentifier("networkAttributes", "array", "android");
String[] naStrings = mContext.getResources().getStringArray(resId);
boolean wifiOnly = SystemProperties.getBoolean("ro.radio.noril", false);
boolean wifiOnly = mPackageManager.hasSystemFeature(FEATURE_WIFI)
&& !mPackageManager.hasSystemFeature(FEATURE_TELEPHONY);
for (String naString : naStrings) {
try {
final String[] splitConfig = naString.split(",");

10
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -365,7 +365,6 @@ import com.android.server.ConnectivityServiceTest.ConnectivityServiceDependencie
import com.android.server.connectivity.CarrierPrivilegeAuthenticator;
import com.android.server.connectivity.ClatCoordinator;
import com.android.server.connectivity.ConnectivityFlags;
import com.android.server.connectivity.MockableSystemProperties;
import com.android.server.connectivity.Nat464Xlat;
import com.android.server.connectivity.NetworkAgentInfo;
import com.android.server.connectivity.NetworkNotificationManager.NotificationType;
@@ -1845,20 +1844,11 @@ public class ConnectivityServiceTest {
class ConnectivityServiceDependencies extends ConnectivityService.Dependencies {
final ConnectivityResources mConnRes;
@Mock final MockableSystemProperties mSystemProperties;
ConnectivityServiceDependencies(final Context mockResContext) {
mSystemProperties = mock(MockableSystemProperties.class);
doReturn(false).when(mSystemProperties).getBoolean("ro.radio.noril", false);
mConnRes = new ConnectivityResources(mockResContext);
}
@Override
public MockableSystemProperties getSystemProperties() {
return mSystemProperties;
}
@Override
public HandlerThread makeHandlerThread() {
return mCsHandlerThread;