From 6e2e7f585ba74213fde92bd23150949f76335fba Mon Sep 17 00:00:00 2001
From: Todd Kennedy <toddke@google.com>
Date: Mon, 2 May 2016 14:56:45 -0700
Subject: [PATCH] use 'int' for min sdk version

per api council

Change-Id: Id3c1191534f61a0d511a6e9932f50ee613830999
---
 api/current.txt                                   | 2 +-
 api/system-current.txt                            | 2 +-
 api/test-current.txt                              | 2 +-
 core/java/android/content/pm/ApplicationInfo.java | 6 +++---
 core/java/android/content/pm/PackageParser.java   | 5 +++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index b7b65f1402c7c..c6c749606f703 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 6b5f1e992d3d2..00ab5a8800de4 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 ae58f3685f165..f9839e833586a 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) {