LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity

Browse Source 
Replace all FIRST_SDK_INT usage in Connectivity because it has
been renamed to DEVICE_INITIAL_SDK_INT.

Bug: 184735771
Test: m CtsNetTestCases
Merged-In: I2f155592b08cdbf259a00b035cacb37ca9847e72
(clean cherry-pick)

Change-Id: I2f155592b08cdbf259a00b035cacb37ca9847e72
This commit is contained in:
paulhu
2021-04-09 15:55:09 +08:00
committed by Remi NGUYEN VAN
parent f15f2769b4
commit bee1c6d9cd
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
service/src/com/android/server/connectivity/PermissionMonitor.java
View File

@@ -145,7 +145,7 @@ public class PermissionMonitor {
* Get device first sdk version. * Get device first sdk version.
*/ */
public int getDeviceFirstSdkInt() { public int getDeviceFirstSdkInt() {
return Build.VERSION.FIRST_SDK_INT; return Build.VERSION.DEVICE_INITIAL_SDK_INT;
} }
/** /**

2
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -1697,7 +1697,7 @@ public class ConnectivityManagerTest {
return; return;
} }
final int firstSdk = Build.VERSION.FIRST_SDK_INT; final int firstSdk = Build.VERSION.DEVICE_INITIAL_SDK_INT;
if (firstSdk < Build.VERSION_CODES.Q) { if (firstSdk < Build.VERSION_CODES.Q) {
Log.i(TAG, "testSocketKeepaliveLimitTelephony: skip test for devices launching" Log.i(TAG, "testSocketKeepaliveLimitTelephony: skip test for devices launching"
+ " before Q: " + firstSdk); + " before Q: " + firstSdk);

6
tests/unit/java/android/net/IpSecAlgorithmTest.java
View File

@@ -123,7 +123,7 @@ public class IpSecAlgorithmTest {
@Test @Test
public void testValidationForAlgosAddedInS() throws Exception { public void testValidationForAlgosAddedInS() throws Exception {
if (Build.VERSION.FIRST_SDK_INT <= Build.VERSION_CODES.R) { if (Build.VERSION.DEVICE_INITIAL_SDK_INT <= Build.VERSION_CODES.R) {
return; return;
} }
@@ -196,13 +196,13 @@ public class IpSecAlgorithmTest {
private static Set<String> getMandatoryAlgos() { private static Set<String> getMandatoryAlgos() {
return CollectionUtils.filter( return CollectionUtils.filter(
ALGO_TO_REQUIRED_FIRST_SDK.keySet(), ALGO_TO_REQUIRED_FIRST_SDK.keySet(),
i -> Build.VERSION.FIRST_SDK_INT >= ALGO_TO_REQUIRED_FIRST_SDK.get(i)); i -> Build.VERSION.DEVICE_INITIAL_SDK_INT >= ALGO_TO_REQUIRED_FIRST_SDK.get(i));
} }
private static Set<String> getOptionalAlgos() { private static Set<String> getOptionalAlgos() {
return CollectionUtils.filter( return CollectionUtils.filter(
ALGO_TO_REQUIRED_FIRST_SDK.keySet(), ALGO_TO_REQUIRED_FIRST_SDK.keySet(),
i -> Build.VERSION.FIRST_SDK_INT < ALGO_TO_REQUIRED_FIRST_SDK.get(i)); i -> Build.VERSION.DEVICE_INITIAL_SDK_INT < ALGO_TO_REQUIRED_FIRST_SDK.get(i));
} }
@Test @Test