summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2016-06-28 19:12:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-06-28 19:12:49 +0000
commita98e3e3ede66a3f93bdfd081cc0b336e723f7ee8 (patch)
treeaaea1ca997921debaa67f2042989e2663f4fca49
parent15783f00736899776e749d2ae93140caffa5ec40 (diff)
parent4f6570878c206b3ee7781ca4341d52c93b812f7b (diff)
Merge "Default minSdkVersion to '1'" into nyc-dev
-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 adf9fe62c37e..4da77f4b35c9 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1871,7 +1871,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;
@@ -1898,9 +1898,6 @@ public class PackageParser {
} else {
// If it's not a string, it's an integer.
targetVers = val.data;
- if (minVers == 0) {
- minVers = targetVers;
- }
}
}