summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ruben Brunk <rubenbrunk@google.com> 2016-07-13 19:06:21 +0000
committer android-build-merger <android-build-merger@google.com> 2016-07-13 19:06:21 +0000
commitd92b174f017d2ebc60a4b9f8abb94c01a9f8f90a (patch)
tree3dd44b2503206e771f147d5b5409812de85348fb
parente1f91a74753e8874eef29f6aad55eb4c54bcfd9c (diff)
parent0b4750165ee3270225fcc99e3ffc49ce69f83e48 (diff)
Merge \"Include all components in VR initialization.\" into nyc-mr1-dev
am: 0b4750165e Change-Id: I33a82666674e5bbc2d0e85480c60b3bd4595264e
-rw-r--r--services/core/java/com/android/server/vr/EnabledComponentsObserver.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/vr/EnabledComponentsObserver.java b/services/core/java/com/android/server/vr/EnabledComponentsObserver.java
index 77e8b1fa541f..40ee5d88fc8a 100644
--- a/services/core/java/com/android/server/vr/EnabledComponentsObserver.java
+++ b/services/core/java/com/android/server/vr/EnabledComponentsObserver.java
@@ -246,7 +246,9 @@ public class EnabledComponentsObserver implements SettingChangeListener {
Intent queryIntent = new Intent(serviceName);
List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
queryIntent,
- PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
+ PackageManager.GET_SERVICES | PackageManager.GET_META_DATA |
+ PackageManager.MATCH_DIRECT_BOOT_AWARE |
+ PackageManager.MATCH_DIRECT_BOOT_UNAWARE,
userId);
if (installedServices != null) {
for (int i = 0, count = installedServices.size(); i < count; i++) {