summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Mak <tonymak@google.com>2016-06-09 14:32:11 +0100
committerTony Mak <tonymak@google.com>2016-06-09 14:32:11 +0100
commita1db3cc833895803213b1dab55b917ad8ab0359f (patch)
tree181f6a5ae89b6d931d976b89afda1b7e24f41102
parent49159d685cef79e1b158640d096c7e49dd318303 (diff)
downloadandroid_packages_apps_ManagedProvisioning-a1db3cc833895803213b1dab55b917ad8ab0359f.tar.gz
android_packages_apps_ManagedProvisioning-a1db3cc833895803213b1dab55b917ad8ab0359f.tar.bz2
android_packages_apps_ManagedProvisioning-a1db3cc833895803213b1dab55b917ad8ab0359f.zip
findDeviceAdmin searchs for disable receiver as well
Bug: 29210257 Change-Id: I378279d6df6c82da73f26ec551c35fa3d162cd79
-rw-r--r--src/com/android/managedprovisioning/common/Utils.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/managedprovisioning/common/Utils.java b/src/com/android/managedprovisioning/common/Utils.java
index 598f3b1f..a2a9d735 100644
--- a/src/com/android/managedprovisioning/common/Utils.java
+++ b/src/com/android/managedprovisioning/common/Utils.java
@@ -176,7 +176,7 @@ public class Utils {
* 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 @@ public class Utils {
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);