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

Commit df76b960 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix clang-tidy warnings in soundtrigger." 

am: 3ba2cb78

Change-Id: Ib9481a6bb666c75b8c0c1db5fc8f480cc85a266a
parents dd25bc51 3ba2cb78

services/soundtrigger/SoundTriggerHwService.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -164,7 +164,7 @@ status_t SoundTriggerHwService::setCaptureState(bool active) 
}

}









void SoundTriggerHwService::detachModule(sp<Module> module)

void SoundTriggerHwService::detachModule(const sp<Module>& module)

{

{

    ALOGV("detachModule");

    ALOGV("detachModule");

    AutoMutex lock(mServiceLock);

    AutoMutex lock(mServiceLock);

services/soundtrigger/SoundTriggerHwService.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ public: 




       sound_trigger_hw_device *hwDevice() const { return mHwDevice; }

       sound_trigger_hw_device *hwDevice() const { return mHwDevice; }

       struct sound_trigger_module_descriptor descriptor() { return mDescriptor; }

       struct sound_trigger_module_descriptor descriptor() { return mDescriptor; }

       void setClient(sp<ISoundTriggerClient> client) { mClient = client; }

       void setClient(const sp<ISoundTriggerClient>& client) { mClient = client; }

       void clearClient() { mClient.clear(); }

       void clearClient() { mClient.clear(); }

       sp<ISoundTriggerClient> client() const { return mClient; }

       sp<ISoundTriggerClient> client() const { return mClient; }

       wp<SoundTriggerHwService> service() const { return mService; }

       wp<SoundTriggerHwService> service() const { return mService; }
@@ -156,7 +156,7 @@ public: 
    class CallbackThread : public Thread {

    class CallbackThread : public Thread {

    public:

    public:





        CallbackThread(const wp<SoundTriggerHwService>& service);

        explicit CallbackThread(const wp<SoundTriggerHwService>& service);





        virtual             ~CallbackThread();

        virtual             ~CallbackThread();
@@ -176,7 +176,7 @@ public: 
        Vector< sp<CallbackEvent> > mEventQueue;

        Vector< sp<CallbackEvent> > mEventQueue;

    };

    };





           void detachModule(sp<Module> module);

           void detachModule(const sp<Module>& module);





    static void recognitionCallback(struct sound_trigger_recognition_event *event, void *cookie);

    static void recognitionCallback(struct sound_trigger_recognition_event *event, void *cookie);

           sp<IMemory> prepareRecognitionEvent_l(struct sound_trigger_recognition_event *event);

           sp<IMemory> prepareRecognitionEvent_l(struct sound_trigger_recognition_event *event);