diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 11:51:30 -0800 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-11-09 11:58:46 -0800 |
| commit | 26c5fa31d17a638bf314de6e12e86bb8a86db44b (patch) | |
| tree | bdc7f3eeafcd04c5194bec6e8f3f2892a52432a0 /include/soundtrigger/SoundTrigger.h | |
| parent | 1c6e16c0b4082c0edaca4fcc0838f33bf14ffac8 (diff) | |
| parent | c13a507aa0badeb5f8482c25e2845780ba021ce7 (diff) | |
| download | frameworks_av-26c5fa31d17a638bf314de6e12e86bb8a86db44b.zip frameworks_av-26c5fa31d17a638bf314de6e12e86bb8a86db44b.tar.gz frameworks_av-26c5fa31d17a638bf314de6e12e86bb8a86db44b.tar.bz2 | |
Merge tag 'android-6.0.1_r74' into HEAD
CYNGNOS-3303
Android 6.0.1 release 74
Change-Id: I0a14578751f4ecb8d13def26b9ffe5dcba4afd72
Diffstat (limited to 'include/soundtrigger/SoundTrigger.h')
| -rw-r--r-- | include/soundtrigger/SoundTrigger.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/soundtrigger/SoundTrigger.h b/include/soundtrigger/SoundTrigger.h index bf5e1de..9a05cac 100644 --- a/include/soundtrigger/SoundTrigger.h +++ b/include/soundtrigger/SoundTrigger.h @@ -68,7 +68,7 @@ public: private: SoundTrigger(sound_trigger_module_handle_t module, const sp<SoundTriggerCallback>&); - static const sp<ISoundTriggerHwService>& getSoundTriggerHwService(); + static const sp<ISoundTriggerHwService> getSoundTriggerHwService(); Mutex mLock; sp<ISoundTrigger> mISoundTrigger; |