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

Merge "Don't override targetVers with minCode" am: 3b0eba4499

Browse Source 
am: 234a906ee1

Change-Id: Ie0eaed7be80819484a41bca5a0bd396138f5870f
This commit is contained in:
Colin Cross
2018-06-19 13:20:48 -07:00
committed by android-build-merger
parent 0e092b7ef6 234a906ee1
commit d5f926ba79
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2199,10 +2199,10 @@ public class PackageParser {
com.android.internal.R.styleable.AndroidManifestUsesSdk_minSdkVersion);
if (val != null) {
if (val.type == TypedValue.TYPE_STRING && val.string != null) {
targetCode = minCode = val.string.toString();
minCode = val.string.toString();
} else {
// If it's not a string, it's an integer.
targetVers = minVers = val.data;
minVers = val.data;
}
}
@@ -2218,6 +2218,9 @@ public class PackageParser {
// If it's not a string, it's an integer.
targetVers = val.data;
}
} else {
targetVers = minVers;
targetCode = minCode;
}
sa.recycle();