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

Commit 7179fd09 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Correctly parse minSdk even when targetSdk is a codename" into tm-dev... 

Merge "Correctly parse minSdk even when targetSdk is a codename" into tm-dev am: 2fb8b2d8 am: 657e9583 am: 3cb72a00

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19087061



Change-Id: I3014afbe824dae39a87c7abb156efae160369637
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56ff35fc 3cb72a00

core/java/android/content/pm/parsing/ApkLiteParseUtils.java

+4 −1
Original line number Diff line number Diff line
@@ -542,14 +542,17 @@ public class ApkLiteParseUtils { 


                int minVer = DEFAULT_MIN_SDK_VERSION;

                String minCode = null;

                boolean minAssigned = false;

                int targetVer = DEFAULT_TARGET_SDK_VERSION;

                String targetCode = null;



                if (!TextUtils.isEmpty(minSdkVersionString)) {

                    try {

                        minVer = Integer.parseInt(minSdkVersionString);

                        minAssigned = true;

                    } catch (NumberFormatException ignored) {

                        minCode = minSdkVersionString;

                        minAssigned = !TextUtils.isEmpty(minCode);

                    }

                }
@@ -558,7 +561,7 @@ public class ApkLiteParseUtils { 
                        targetVer = Integer.parseInt(targetSdkVersionString);

                    } catch (NumberFormatException ignored) {

                        targetCode = targetSdkVersionString;

                        if (minCode == null) {

                        if (!minAssigned) {

                            minCode = targetCode;

                        }

                    }

services/core/java/com/android/server/pm/pkg/parsing/ParsingPackageUtils.java

+4 −1
Original line number Diff line number Diff line
@@ -1540,6 +1540,7 @@ public class ParsingPackageUtils { 
            try {

                int minVers = ParsingUtils.DEFAULT_MIN_SDK_VERSION;

                String minCode = null;

                boolean minAssigned = false;

                int targetVers = ParsingUtils.DEFAULT_TARGET_SDK_VERSION;

                String targetCode = null;

                int maxVers = Integer.MAX_VALUE;
@@ -1548,9 +1549,11 @@ public class ParsingPackageUtils { 
                if (val != null) {

                    if (val.type == TypedValue.TYPE_STRING && val.string != null) {

                        minCode = val.string.toString();

                        minAssigned = !TextUtils.isEmpty(minCode);

                    } else {

                        // If it's not a string, it's an integer.

                        minVers = val.data;

                        minAssigned = true;

                    }

                }
@@ -1558,7 +1561,7 @@ public class ParsingPackageUtils { 
                if (val != null) {

                    if (val.type == TypedValue.TYPE_STRING && val.string != null) {

                        targetCode = val.string.toString();

                        if (minCode == null) {

                        if (!minAssigned) {

                            minCode = targetCode;

                        }

                    } else {