diff options
8 files changed, 9 insertions, 9 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index 5d23eb20a81a..bfa5a7b6af51 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -121,7 +121,7 @@ package android.os { } public static class Build.VERSION { - field public static final int FIRST_SDK_INT; + field public static final int DEVICE_INITIAL_SDK_INT; } public interface Parcelable { diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 3b759a2f69d0..661394732a12 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -1037,7 +1037,7 @@ package android.os { public static class Build.VERSION { field public static final String[] ACTIVE_CODENAMES; - field public static final int FIRST_SDK_INT; + field public static final int DEVICE_INITIAL_SDK_INT; field public static final int RESOURCES_SDK_INT; } diff --git a/core/java/android/net/IpSecAlgorithm.java b/core/java/android/net/IpSecAlgorithm.java index 8f1e2defd215..7ef5bac092f6 100644 --- a/core/java/android/net/IpSecAlgorithm.java +++ b/core/java/android/net/IpSecAlgorithm.java @@ -354,7 +354,7 @@ public final class IpSecAlgorithm implements Parcelable { } for (Entry<String, Integer> entry : ALGO_TO_REQUIRED_FIRST_SDK.entrySet()) { - if (Build.VERSION.FIRST_SDK_INT >= entry.getValue()) { + if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= entry.getValue()) { enabledAlgos.add(entry.getKey()); } } diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 5017d9e8d905..de1304478124 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -333,7 +333,7 @@ public class Build { */ @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @TestApi - public static final int FIRST_SDK_INT = SystemProperties + public static final int DEVICE_INITIAL_SDK_INT = SystemProperties .getInt("ro.product.first_api_level", 0); /** diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index d6e2c2f6d783..59e95c98499e 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -484,7 +484,7 @@ public class SystemConfig { // Vendors are only allowed to customize these int vendorPermissionFlag = ALLOW_LIBS | ALLOW_FEATURES | ALLOW_PRIVAPP_PERMISSIONS | ALLOW_ASSOCIATIONS; - if (Build.VERSION.FIRST_SDK_INT <= Build.VERSION_CODES.O_MR1) { + if (Build.VERSION.DEVICE_INITIAL_SDK_INT <= Build.VERSION_CODES.O_MR1) { // For backward compatibility vendorPermissionFlag |= (ALLOW_PERMISSIONS | ALLOW_APP_CONFIGS); } @@ -1252,7 +1252,7 @@ public class SystemConfig { addFeature(PackageManager.FEATURE_APP_ENUMERATION, 0); } - if (Build.VERSION.FIRST_SDK_INT >= Build.VERSION_CODES.Q) { + if (Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.Q) { addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0); } diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java index a90fee6788a8..90f84cafda4d 100644 --- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java +++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java @@ -860,7 +860,7 @@ public class FingerprintService extends BiometricServiceBase { try { userId = getUserOrWorkProfileId(clientPackage, userId); if (userId != mCurrentUserId) { - int firstSdkInt = Build.VERSION.FIRST_SDK_INT; + int firstSdkInt = Build.VERSION.DEVICE_INITIAL_SDK_INT; if (firstSdkInt < Build.VERSION_CODES.BASE) { Slog.e(TAG, "First SDK version " + firstSdkInt + " is invalid; must be " + "at least VERSION_CODES.BASE"); diff --git a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java index de0e4b53adab..b658fe0b10f3 100644 --- a/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java +++ b/services/core/java/com/android/server/pm/PackageManagerServiceUtils.java @@ -596,7 +596,7 @@ public class PackageManagerServiceUtils { /** Returns true if standard APK Verity is enabled. */ static boolean isApkVerityEnabled() { - return Build.VERSION.FIRST_SDK_INT >= Build.VERSION_CODES.R + return Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.R || SystemProperties.getInt("ro.apk_verity.mode", FSVERITY_DISABLED) == FSVERITY_ENABLED; } diff --git a/services/core/java/com/android/server/security/FileIntegrityService.java b/services/core/java/com/android/server/security/FileIntegrityService.java index 225bd82e9a21..a690647d8c9e 100644 --- a/services/core/java/com/android/server/security/FileIntegrityService.java +++ b/services/core/java/com/android/server/security/FileIntegrityService.java @@ -60,7 +60,7 @@ public class FileIntegrityService extends SystemService { private final IBinder mService = new IFileIntegrityService.Stub() { @Override public boolean isApkVeritySupported() { - return Build.VERSION.FIRST_SDK_INT >= Build.VERSION_CODES.R + return Build.VERSION.DEVICE_INITIAL_SDK_INT >= Build.VERSION_CODES.R || SystemProperties.getInt("ro.apk_verity.mode", 0) == 2; } |