diff options
| author | Ahaan Ugale <augale@google.com> | 2021-07-24 07:23:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-24 07:23:39 +0000 |
| commit | 7916020e2bc7653bbf1a2dd0f841d35a2aee4fe8 (patch) | |
| tree | 8cbcd045a96be55f54ae535ec28d5fe1a38584b0 /core/java/android | |
| parent | dcce3e2682e770b9c5429d9b6a9488f6b55b445e (diff) | |
| parent | 9c1d1a05fef14df68ccc26d4523c378bb1be9217 (diff) | |
Merge changes I212ad58c,Idf5dd82d into sc-dev am: 0e3d3b90ec am: 9c1d1a05fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15360457
Change-Id: Ia0d660886263d62272b81315aa1cea05b70324f0
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/service/voice/HotwordDetectionService.java | 7 | ||||
| -rw-r--r-- | core/java/android/service/voice/SoftwareHotwordDetector.java | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/core/java/android/service/voice/HotwordDetectionService.java b/core/java/android/service/voice/HotwordDetectionService.java index a43523974480..e3bb589c9a19 100644 --- a/core/java/android/service/voice/HotwordDetectionService.java +++ b/core/java/android/service/voice/HotwordDetectionService.java @@ -72,8 +72,7 @@ import java.util.function.IntConsumer; @SystemApi public abstract class HotwordDetectionService extends Service { private static final String TAG = "HotwordDetectionService"; - // TODO (b/177502877): Set the Debug flag to false before shipping. - private static final boolean DBG = true; + private static final boolean DBG = false; private static final long UPDATE_TIMEOUT_MILLIS = 5000; @@ -151,9 +150,7 @@ public abstract class HotwordDetectionService extends Service { @Override public void updateState(PersistableBundle options, SharedMemory sharedMemory, IRemoteCallback callback) throws RemoteException { - if (DBG) { - Log.d(TAG, "#updateState"); - } + Log.v(TAG, "#updateState" + (callback != null ? " with callback" : "")); HotwordDetectionService.this.onUpdateStateInternal( options, sharedMemory, diff --git a/core/java/android/service/voice/SoftwareHotwordDetector.java b/core/java/android/service/voice/SoftwareHotwordDetector.java index fb540b1622e6..02294e5720ae 100644 --- a/core/java/android/service/voice/SoftwareHotwordDetector.java +++ b/core/java/android/service/voice/SoftwareHotwordDetector.java @@ -47,7 +47,7 @@ import java.io.PrintWriter; **/ class SoftwareHotwordDetector extends AbstractHotwordDetector { private static final String TAG = SoftwareHotwordDetector.class.getSimpleName(); - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private final IVoiceInteractionManagerService mManagerService; private final HotwordDetector.Callback mCallback; |