summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Todd Kennedy <toddke@google.com> 2016-06-28 19:16:40 +0000
committer android-build-merger <android-build-merger@google.com> 2016-06-28 19:16:40 +0000
commita1066ed6c20015db7acd2eae06d23687f1869077 (patch)
tree4bb9587ff77c7b21cf16d941e69188362d39e628
parent41f0e20739842d0d7b9b746dc23ce36e1867a476 (diff)
parenta98e3e3ede66a3f93bdfd081cc0b336e723f7ee8 (diff)
Merge \"Default minSdkVersion to \'1\'\" into nyc-dev
am: a98e3e3ede Change-Id: I8d2b7205f80b3cae5dce04839890df6aafa8449e
-rw-r--r--core/java/android/content/pm/PackageParser.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index f59a7dda5696..82cd448e7776 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1876,7 +1876,7 @@ public class PackageParser {
sa = res.obtainAttributes(parser,
com.android.internal.R.styleable.AndroidManifestUsesSdk);
- int minVers = 0;
+ int minVers = 1;
String minCode = null;
int targetVers = 0;
String targetCode = null;
@@ -1903,9 +1903,6 @@ public class PackageParser {
} else {
// If it's not a string, it's an integer.
targetVers = val.data;
- if (minVers == 0) {
- minVers = targetVers;
- }
}
}