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

Merge "Address aosp/3541181 leftover comments" into main

Browse source
This commit is contained in:
Paul Hu 2025-03-25 22:06:01 -07:00 • committed by Gerrit Code Review
commit bd1703ff4f
2 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
View file

@ -767,23 +767,17 @@ public class TetheringConfigurationTest {
mMockContext, mLog, INVALID_SUBSCRIPTION_ID, mDeps).readEnableSyncSM(mMockContext); mMockContext, mLog, INVALID_SUBSCRIPTION_ID, mDeps).readEnableSyncSM(mMockContext);
} }
private void assertEnableSyncSM(boolean value) {
assertEquals(value, TetheringConfiguration.USE_SYNC_SM);
}
@Test @Test
public void testEnableSyncSMFlag() throws Exception { public void testEnableSyncSMFlag() throws Exception {
// Test default enabled // Test default enabled
setTetherEnableSyncSMFlagEnabled(null); setTetherEnableSyncSMFlagEnabled(null);
assertEnableSyncSM(true); assertEquals(true, TetheringConfiguration.USE_SYNC_SM);
setTetherEnableSyncSMFlagEnabled(true); setTetherEnableSyncSMFlagEnabled(true);
assertEnableSyncSM(true); assertEquals(true, TetheringConfiguration.USE_SYNC_SM);
// Feature is enabled by default after 25Q2 release. // Feature is enabled forcefully after 25Q2 release.
if (!SdkUtil.isAtLeast25Q2()) { setTetherEnableSyncSMFlagEnabled(false);
setTetherEnableSyncSMFlagEnabled(false); assertEquals(SdkUtil.isAtLeast25Q2(), TetheringConfiguration.USE_SYNC_SM);
assertEnableSyncSM(false);
}
} }
} }

2
staticlibs/framework/com/android/net/module/util/SdkUtil.java
View file

@ -52,6 +52,6 @@ public class SdkUtil {
/** Checks if the device is running on a release version of Android Baklava or newer */ /** Checks if the device is running on a release version of Android Baklava or newer */
public static boolean isAtLeast25Q2() { public static boolean isAtLeast25Q2() {
return SDK_INT >= 36 || (SDK_INT == 35 && "Baklava".equals(Build.VERSION.CODENAME)); return SDK_INT >= 36 || (SDK_INT == 35 && "Baklava".equals(Build.VERSION.CODENAME));
} }
} }