summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2016-06-02 22:47:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-06-02 22:47:26 +0000
commitbd28e027ed87da6cdc2313481439aeab021b2820 (patch)
treefa4906f50b2e38852f386b2245b0294e652628c8 /core/java
parentf6be4c023fbd29d14fdd0b8df6b939b8a46cf553 (diff)
parente34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d (diff)
Merge "Properly set default voice interactor" into nyc-dev
am: e34bb5a1ff * commit 'e34bb5a1ffc5fe35b2fbc58824ad5bfbc7ecad3d': Properly set default voice interactor Change-Id: Ifcad5647ee8ab09765fe89f40693eb335996982a
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/service/voice/VoiceInteractionServiceInfo.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
index a9db32b703fa..e1a9a050212c 100644
--- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java
+++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
@@ -61,7 +61,11 @@ public class VoiceInteractionServiceInfo {
throws PackageManager.NameNotFoundException {
try {
ServiceInfo si = AppGlobals.getPackageManager().getServiceInfo(comp,
- PackageManager.GET_META_DATA, userHandle);
+ PackageManager.GET_META_DATA
+ | PackageManager.MATCH_DIRECT_BOOT_AWARE
+ | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+ | PackageManager.MATCH_DEBUG_TRIAGED_MISSING,
+ userHandle);
if (si != null) {
return si;
}