Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "use 'int' for min sdk version" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-02 23:19:42 +00:00
committed by Android (Google) Code Review
parent d88030fe9e 6e2e7f585b
commit 6a3948bc12
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -9395,7 +9395,7 @@ package android.content.pm {
field public int flags; field public int flags;
field public int largestWidthLimitDp; field public int largestWidthLimitDp;
field public java.lang.String manageSpaceActivityName; 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 nativeLibraryDir;
field public java.lang.String permission; field public java.lang.String permission;
field public java.lang.String processName; field public java.lang.String processName;

2
api/system-current.txt
View File

@@ -9738,7 +9738,7 @@ package android.content.pm {
field public int flags; field public int flags;
field public int largestWidthLimitDp; field public int largestWidthLimitDp;
field public java.lang.String manageSpaceActivityName; 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 nativeLibraryDir;
field public java.lang.String permission; field public java.lang.String permission;
field public java.lang.String processName; field public java.lang.String processName;

2
api/test-current.txt
View File

@@ -9404,7 +9404,7 @@ package android.content.pm {
field public int flags; field public int flags;
field public int largestWidthLimitDp; field public int largestWidthLimitDp;
field public java.lang.String manageSpaceActivityName; 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 nativeLibraryDir;
field public java.lang.String permission; field public java.lang.String permission;
field public java.lang.String processName; field public java.lang.String processName;

6
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -728,7 +728,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
* The minimum SDK version this application can run on. It will not run * The minimum SDK version this application can run on. It will not run
* on earlier versions. * on earlier versions.
*/ */
public String minSdkVersion; public int minSdkVersion;
/** /**
* The minimum SDK version this application targets. It may run on earlier * 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(deviceProtectedDataDir);
dest.writeString(credentialProtectedDataDir); dest.writeString(credentialProtectedDataDir);
dest.writeInt(uid); dest.writeInt(uid);
dest.writeString(minSdkVersion); dest.writeInt(minSdkVersion);
dest.writeInt(targetSdkVersion); dest.writeInt(targetSdkVersion);
dest.writeInt(versionCode); dest.writeInt(versionCode);
dest.writeInt(enabled ? 1 : 0); dest.writeInt(enabled ? 1 : 0);
@@ -1020,7 +1020,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
deviceEncryptedDataDir = deviceProtectedDataDir = source.readString(); deviceEncryptedDataDir = deviceProtectedDataDir = source.readString();
credentialEncryptedDataDir = credentialProtectedDataDir = source.readString(); credentialEncryptedDataDir = credentialProtectedDataDir = source.readString();
uid = source.readInt(); uid = source.readInt();
minSdkVersion = source.readString(); minSdkVersion = source.readInt();
targetSdkVersion = source.readInt(); targetSdkVersion = source.readInt();
versionCode = source.readInt(); versionCode = source.readInt();
enabled = source.readInt() != 0; enabled = source.readInt() != 0;

5
core/java/android/content/pm/PackageParser.java
View File

@@ -1926,14 +1926,15 @@ public class PackageParser {
mParseError = PackageManager.INSTALL_FAILED_OLDER_SDK; mParseError = PackageManager.INSTALL_FAILED_OLDER_SDK;
return null; return null;
} }
pkg.applicationInfo.minSdkVersion = minCode; pkg.applicationInfo.minSdkVersion =
android.os.Build.VERSION_CODES.CUR_DEVELOPMENT;
} else if (minVers > SDK_VERSION) { } else if (minVers > SDK_VERSION) {
outError[0] = "Requires newer sdk version #" + minVers outError[0] = "Requires newer sdk version #" + minVers
+ " (current version is #" + SDK_VERSION + ")"; + " (current version is #" + SDK_VERSION + ")";
mParseError = PackageManager.INSTALL_FAILED_OLDER_SDK; mParseError = PackageManager.INSTALL_FAILED_OLDER_SDK;
return null; return null;
} else { } else {
pkg.applicationInfo.minSdkVersion = Integer.toString(minVers); pkg.applicationInfo.minSdkVersion = minVers;
} }
if (targetCode != null) { if (targetCode != null) {