summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ruben Brunk <rubenbrunk@google.com> 2016-07-13 19:02:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-07-13 19:02:26 +0000
commit0b4750165ee3270225fcc99e3ffc49ce69f83e48 (patch)
tree8ff6c805d986d7d7984b1da58a8b44a0968eddd5
parent5bd9ea82d2ab79911abadc7afbdf208f79e9d160 (diff)
parent715fa57d1b9de86ca9952fba0490611ef90b0b3b (diff)
Merge "Include all components in VR initialization." into nyc-mr1-dev
-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++) {