Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa1f49c5 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "use \'int\' for min sdk version" into nyc-dev am: 6a3948bc 

am: 09bad50e

* commit '09bad50e':
  use 'int' for min sdk version

Change-Id: Ib4968452de3892d59772d4c7317b67e13b6e9691
parents f3af5b21 09bad50e

api/current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

api/test-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

core/java/android/content/pm/ApplicationInfo.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -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;

core/java/android/content/pm/PackageParser.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -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) {