use 'int' for min sdk version
per api council
Change-Id: Id3c1191534f61a0d511a6e9932f50ee613830999
diff --git a/api/current.txt b/api/current.txt
index b7b65f1..c6c7496 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9395,7 +9395,7 @@
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 6b5f1e9..00ab5a8 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9738,7 +9738,7 @@
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 ae58f36..f9839e8 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -9404,7 +9404,7 @@
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 585d2a3..51a7be4 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -728,7 +728,7 @@
* 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 @@
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 @@
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 6534f5b..e09680e 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1926,14 +1926,15 @@
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) {