Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab0d80a6 authored by Hui Yu's avatar Hui Yu Committed by Automerger Merge Worker
Browse files

Merge "Use BIND_INCLUDE_CAPABILITIES for SoundTriggerService" into rvc-dev am:... 

Merge "Use BIND_INCLUDE_CAPABILITIES for SoundTriggerService" into rvc-dev am: 7ab1ea2a am: fda2da0a am: c8dbc521

Change-Id: I1c8c67e81e4c5af9bd8f08a81db8b870d3569569
parents c4825e8a c8dbc521

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.soundtrigger; 
import static android.Manifest.permission.BIND_SOUND_TRIGGER_DETECTION_SERVICE;

import static android.Manifest.permission.BIND_SOUND_TRIGGER_DETECTION_SERVICE;

import static android.content.Context.BIND_AUTO_CREATE;

import static android.content.Context.BIND_AUTO_CREATE;

import static android.content.Context.BIND_FOREGROUND_SERVICE;

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_META_DATA;

import static android.content.pm.PackageManager.GET_SERVICES;

import static android.content.pm.PackageManager.GET_SERVICES;

import static android.content.pm.PackageManager.MATCH_DEBUG_TRIAGED_MISSING;

import static android.content.pm.PackageManager.MATCH_DEBUG_TRIAGED_MISSING;
@@ -1133,7 +1134,8 @@ public class SoundTriggerService extends SystemService { 
                }

                }





                mIsBound = mContext.bindServiceAsUser(i, this,

                mIsBound = mContext.bindServiceAsUser(i, this,

                        BIND_AUTO_CREATE | BIND_FOREGROUND_SERVICE, mUser);

                        BIND_AUTO_CREATE | BIND_FOREGROUND_SERVICE | BIND_INCLUDE_CAPABILITIES,

                        mUser);





                if (mIsBound) {

                if (mIsBound) {

                    mRemoteServiceWakeLock.acquire();

                    mRemoteServiceWakeLock.acquire();