commit 1ff15b460924bdab70149d1f0331faa5c01193e2
author The Android Automerger <android-build@google.com> Sun Jun 12 00:04:49 2016 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 12 00:04:49 2016 -0700
tree 181f6a5ae89b6d931d976b89afda1b7e24f41102
parent a1db3cc833895803213b1dab55b917ad8ab0359f
parent 97badeeecac6e51248a930006f5df476a1f608e8

merge in nyc-release history after reset to nyc-dev

src/com/android/managedprovisioning/common/Utils.java

diff --git a/src/com/android/managedprovisioning/common/Utils.java b/src/com/android/managedprovisioning/common/Utils.java
index 598f3b1..a2a9d73 100644
--- a/src/com/android/managedprovisioning/common/Utils.java
+++ b/src/com/android/managedprovisioning/common/Utils.java
@@ -176,7 +176,7 @@
      * If mdmComponentName is supplied (not null):
      * mdmPackageName is ignored.
      * Check that the package of mdmComponentName is installed, that mdmComponentName is a
-     * receiver in this package, and return it.
+     * receiver in this package, and return it. The receiver can be in disabled state.
      *
      * Otherwise:
      * mdmPackageName must be supplied (not null).
@@ -196,7 +196,7 @@
         PackageInfo pi;
         try {
             pi = c.getPackageManager().getPackageInfo(mdmPackageName,
-                    PackageManager.GET_RECEIVERS);
+                    PackageManager.GET_RECEIVERS | PackageManager.MATCH_DISABLED_COMPONENTS);
         } catch (NameNotFoundException e) {
             throw new IllegalProvisioningArgumentException("Mdm "+ mdmPackageName
                     + " is not installed. ", e);