commit 5798a3759617226c805d95f51059582cbd2b57f5
author Remi NGUYEN VAN <reminv@google.com> Thu Apr 22 15:49:20 2021 +0900
committer Remi NGUYEN VAN <reminv@google.com> Tue Apr 27 21:59:25 2021 +0900
tree 7a4aed022f9aa02f06d7285bcd1fc426000c0201
parent 5d1cfaf1c6ffc2982dd97280cabfad95c2680ce5

Fix testSocketKeepaliveLimitTelephony on R

DEVICE_INITIAL_SDK_INT does not exist in older SDKs: use the pre-rename
field, FIRST_SDK_INT instead.

Fixes: 185731191
Test: atest ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
Ignore-AOSP-First: Needs cherry-picks

Change-Id: I1fbc0f714d539a664c053cb9cf1f86c3e651c5a2

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 cbeccb8..23897f4 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.common.ConnectivityManagerShim;
 import com.android.testutils.CompatUtil;
@@ -1418,7 +1419,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);