commit 3040e81c8f5e238c50dd6c0b25aa009f9aa1c7a4
author Paul Hu <paulhu@google.com> Wed Apr 28 02:19:09 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 28 02:19:09 2021 +0000
tree 9c1d0dff8637a3c3d01d3cdad7f01e31e0af165d
parent a5286902fd174546f6801a0ef3c8f7a59a05d31a
parent 5798a3759617226c805d95f51059582cbd2b57f5

Merge "Fix testSocketKeepaliveLimitTelephony on R" into sc-dev

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
index ce24a24..f474e23 100644
--- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
+++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
@@ -131,6 +131,7 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.internal.util.ArrayUtils;
+import com.android.modules.utils.build.SdkLevel;
 import com.android.networkstack.apishim.ConnectivityManagerShimImpl;
 import com.android.networkstack.apishim.ConstantsShim;
 import com.android.networkstack.apishim.NetworkInformationShimImpl;
@@ -1420,7 +1421,10 @@
             return;
         }
 
-        final int firstSdk = Build.VERSION.DEVICE_INITIAL_SDK_INT;
+        final int firstSdk = SdkLevel.isAtLeastS()
+                ? Build.VERSION.DEVICE_INITIAL_SDK_INT
+                // FIRST_SDK_INT was a @TestApi field renamed to DEVICE_INITIAL_SDK_INT in S
+                : Build.VERSION.class.getField("FIRST_SDK_INT").getInt(null);
         if (firstSdk < Build.VERSION_CODES.Q) {
             Log.i(TAG, "testSocketKeepaliveLimitTelephony: skip test for devices launching"
                     + " before Q: " + firstSdk);