summaryrefslogtreecommitdiff
path: root/services/voiceinteraction
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2020-07-28 03:03:41 +0200
committerRobin Lee <rgl@google.com>2020-07-28 19:42:55 +0000
commitf6ef97cd1db16b1adb404f379a305287c42a6555 (patch)
tree8495421e3a6707748b5b22907712faaee1133df6 /services/voiceinteraction
parent8d411d947a7dddf42c07a1c56d9ded0577ad53a3 (diff)
Fix NullPointerException thrown by logging
When `properties` is null, this propagates a NullPointerException back to the caller instead of cleanly reporting null like it's supposed to. Issue introduced in Iec7ba6fc59912f44341fbe8d7f99193b9ead52f0 from the start of this function and is fixed by just printing `object` instead of `object.toString()`. Test: atest AssistIntentConditionalTest Bug: 158682298 Change-Id: Ic64f6fba65895e9facc9994f5d1a353081ab3253 (cherry picked from commit 935906e180cea734bf7195c1d1a2a26fbe9d4981)
Diffstat (limited to 'services/voiceinteraction')
-rw-r--r--services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java2
1 files changed, 1 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 6c13cd799bc2..534fe036ba87 100644
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
@@ -697,7 +697,7 @@ public class SoundTriggerService extends SystemService {
synchronized (mLock) {
ModuleProperties properties = mSoundTriggerHelper.getModuleProperties();
sEventLogger.log(new SoundTriggerLogger.StringEvent(
- "getModuleProperties(): " + properties.toString()));
+ "getModuleProperties(): " + properties));
return properties;
}
}