commit c1374208e3b5a415770060b10416fada36c40e0f
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 28 20:45:37 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 28 20:45:40 2016 +0000
tree 201f71701411265f5fdd803bb565863bf7145e42
parent 8d78c33c9b27d06c258f2ed7613424e6cb3859ad
parent dd85da6e94fc7fd239fd97b954c1c78e66b265d6

Merge "Remove redundant setPendingIntentWhitelistDuration() calls." into nyc-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index c2d3987..dec667e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -495,6 +495,10 @@
 
 LOCAL_RMTYPEDEFS := true
 
+ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
+LOCAL_EMMA_INSTRUMENT := true
+endif
+
 include $(BUILD_JAVA_LIBRARY)
 framework_module := $(LOCAL_INSTALLED_MODULE)
 

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

diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index adf9fe6..4da77f4 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1871,7 +1871,7 @@
                     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 @@
                         } else {
                             // If it's not a string, it's an integer.
                             targetVers = val.data;
-                            if (minVers == 0) {
-                                minVers = targetVers;
-                            }
                         }
                     }