diff options
| author | Nicholas Ambur <nambur@google.com> | 2020-03-23 15:42:21 -0700 |
|---|---|---|
| committer | Nicholas Ambur <nambur@google.com> | 2020-03-23 15:42:21 -0700 |
| commit | 78a22682fbd60d1249d1622a22a2ee24ba38ee79 (patch) | |
| tree | 0ee3a66d52b9efc4c4dfd269493619be371a0c23 /services/voiceinteraction | |
| parent | 1e03bc0539308e9b99da1e738d437f196a5e9074 (diff) | |
disable SoundTriggerService in safe mode
Bug: 150569186
Test: confirm `dumpsys voiceinteraction` shows no active service
&& confirm `dumpsys soundtrigger_middleware` shows no API calls.
Change-Id: I6b5879c662826e86a6f41f3c3aea444f0674f24c
Diffstat (limited to 'services/voiceinteraction')
| -rw-r--r-- | services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java | 8 |
1 files changed, 7 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 3196758996be..00cb6dc7400d 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java @@ -207,7 +207,13 @@ public class SoundTriggerService extends SystemService { @Override public void onBootPhase(int phase) { - if (PHASE_SYSTEM_SERVICES_READY == phase) { + Slog.d(TAG, "onBootPhase: " + phase + " : " + isSafeMode()); + if (PHASE_DEVICE_SPECIFIC_SERVICES_READY == phase) { + if (isSafeMode()) { + Slog.w(TAG, "not enabling SoundTriggerService in safe mode"); + return; + } + initSoundTriggerHelper(); mLocalSoundTriggerService.setSoundTriggerHelper(mSoundTriggerHelper); } else if (PHASE_THIRD_PARTY_APPS_CAN_START == phase) { |