commit 86961c4b73d7714536b2e528402687da6b95c9ba
author Chaitanya Cheemala (xWF) <ccheemala@google.com> Wed Mar 26 03:44:15 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 26 03:44:15 2025 -0700
tree 9486319de822991f22efc6d7bb1dbcf09657d4db
parent ebdcd9e199970f6c1bfe5767335c34a5ecb733dc
parent 947b53b0d39fe165d5f0273b6349a1f866681c10

Merge changes from topic "revert-3538339-SNUWWZJNJZ" into main

* changes:
  Revert "Add hidden API to register/unregister QUIC connection cl..."
  Revert "Remove unnecessary ifindex arg from destroyUdpSocket"

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

diff --git a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
index c4c7c9c..f0b7db6 100644
--- a/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
+++ b/Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringConfigurationTest.java
@@ -767,23 +767,17 @@
                 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);
     }
 }

staticlibs/framework/com/android/net/module/util/SdkUtil.java

diff --git a/staticlibs/framework/com/android/net/module/util/SdkUtil.java b/staticlibs/framework/com/android/net/module/util/SdkUtil.java
index 63558dd..1acb156 100644
--- a/staticlibs/framework/com/android/net/module/util/SdkUtil.java
+++ b/staticlibs/framework/com/android/net/module/util/SdkUtil.java
@@ -52,6 +52,6 @@
 
     /** 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));
     }
 }