diff --git a/api/current.txt b/api/current.txt index 0e3eb05e73f0d..fff444de3f2b5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9395,7 +9395,7 @@ package android.content.pm { field public int flags; field public int largestWidthLimitDp; field public java.lang.String manageSpaceActivityName; - field public java.lang.String minSdkVersion; + field public int minSdkVersion; field public java.lang.String nativeLibraryDir; field public java.lang.String permission; field public java.lang.String processName; diff --git a/api/system-current.txt b/api/system-current.txt index 132513c2f69e7..e86bb1b278aa6 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9738,7 +9738,7 @@ package android.content.pm { field public int flags; field public int largestWidthLimitDp; field public java.lang.String manageSpaceActivityName; - field public java.lang.String minSdkVersion; + field public int minSdkVersion; field public java.lang.String nativeLibraryDir; field public java.lang.String permission; field public java.lang.String processName; diff --git a/api/test-current.txt b/api/test-current.txt index c888e13b1d425..a7282f2e2544d 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -9404,7 +9404,7 @@ package android.content.pm { field public int flags; field public int largestWidthLimitDp; field public java.lang.String manageSpaceActivityName; - field public java.lang.String minSdkVersion; + field public int minSdkVersion; field public java.lang.String nativeLibraryDir; field public java.lang.String permission; field public java.lang.String processName; diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 585d2a3c4b255..51a7be4c1a679 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -728,7 +728,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { * The minimum SDK version this application can run on. It will not run * on earlier versions. */ - public String minSdkVersion; + public int minSdkVersion; /** * The minimum SDK version this application targets. It may run on earlier @@ -965,7 +965,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { dest.writeString(deviceProtectedDataDir); dest.writeString(credentialProtectedDataDir); dest.writeInt(uid); - dest.writeString(minSdkVersion); + dest.writeInt(minSdkVersion); dest.writeInt(targetSdkVersion); dest.writeInt(versionCode); dest.writeInt(enabled ? 1 : 0); @@ -1020,7 +1020,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { deviceEncryptedDataDir = deviceProtectedDataDir = source.readString(); credentialEncryptedDataDir = credentialProtectedDataDir = source.readString(); uid = source.readInt(); - minSdkVersion = source.readString(); + minSdkVersion = source.readInt(); targetSdkVersion = source.readInt(); versionCode = source.readInt(); enabled = source.readInt() != 0; diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 6534f5b324563..e09680e84d75d 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -1926,14 +1926,15 @@ public class PackageParser { mParseError = PackageManager.INSTALL_FAILED_OLDER_SDK; return null; } - pkg.applicationInfo.minSdkVersion = minCode; + pkg.applicationInfo.minSdkVersion = + android.os.Build.VERSION_CODES.CUR_DEVELOPMENT; } else if (minVers > SDK_VERSION) { outError[0] = "Requires newer sdk version #" + minVers + " (current version is #" + SDK_VERSION + ")"; mParseError = PackageManager.INSTALL_FAILED_OLDER_SDK; return null; } else { - pkg.applicationInfo.minSdkVersion = Integer.toString(minVers); + pkg.applicationInfo.minSdkVersion = minVers; } if (targetCode != null) {