summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHui Yu <huiyu@google.com>2020-03-17 19:40:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-03-17 19:40:29 +0000
commit7ab1ea2ac3b07c4e3a91e499347c37cd604601e6 (patch)
tree0eb73eb9706dfd75418f2fc4fe67a961065a3593
parent18ee16a6d51ad1ea13f7bf12206f4ae225835a85 (diff)
parent67b5e387b5d5af90a3be266a37282073b5f84fdd (diff)
Merge "Use BIND_INCLUDE_CAPABILITIES for SoundTriggerService" into rvc-dev
-rw-r--r--services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
index 767010ae821a..3196758996be 100644
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
@@ -19,6 +19,7 @@ package com.android.server.soundtrigger;
import static android.Manifest.permission.BIND_SOUND_TRIGGER_DETECTION_SERVICE;
import static android.content.Context.BIND_AUTO_CREATE;
import static android.content.Context.BIND_FOREGROUND_SERVICE;
+import static android.content.Context.BIND_INCLUDE_CAPABILITIES;
import static android.content.pm.PackageManager.GET_META_DATA;
import static android.content.pm.PackageManager.GET_SERVICES;
import static android.content.pm.PackageManager.MATCH_DEBUG_TRIAGED_MISSING;
@@ -1133,7 +1134,8 @@ public class SoundTriggerService extends SystemService {
}
mIsBound = mContext.bindServiceAsUser(i, this,
- BIND_AUTO_CREATE | BIND_FOREGROUND_SERVICE, mUser);
+ BIND_AUTO_CREATE | BIND_FOREGROUND_SERVICE | BIND_INCLUDE_CAPABILITIES,
+ mUser);
if (mIsBound) {
mRemoteServiceWakeLock.acquire();