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 am: bd1703ff4f

Browse source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3555993

Change-Id: I5b6a7126ff771f27a7d74b48ae4eb947243138dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Paul Hu 2025-03-25 22:25:41 -07:00 • committed by Automerger Merge Worker
commit 22ffcebc41
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);
}
private void assertEnableSyncSM(boolean value) {
assertEquals(value, TetheringConfiguration.USE_SYNC_SM);
}
@Test
public void testEnableSyncSMFlag() throws Exception {
// Test default enabled
setTetherEnableSyncSMFlagEnabled(null);
assertEnableSyncSM(true);
assertEquals(true, TetheringConfiguration.USE_SYNC_SM);
setTetherEnableSyncSMFlagEnabled(true);
assertEnableSyncSM(true);
assertEquals(true, TetheringConfiguration.USE_SYNC_SM);
// Feature is enabled by default after 25Q2 release.
if (!SdkUtil.isAtLeast25Q2()) {
setTetherEnableSyncSMFlagEnabled(false);
assertEnableSyncSM(false);
}
// Feature is enabled forcefully after 25Q2 release.
setTetherEnableSyncSMFlagEnabled(false);
assertEquals(SdkUtil.isAtLeast25Q2(), TetheringConfiguration.USE_SYNC_SM);
}
}

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 */
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));
}
}