From cabbb11c019098428e312663e84bee7c90bf36e7 Mon Sep 17 00:00:00 2001 From: mike dooley Date: Tue, 17 Apr 2018 17:19:04 +0200 Subject: [PATCH] Fixing a couple crashes in the SoundTriggerTestApp Bug: 78269975 Test: built and ran the SoundTriggerTestApp Change-Id: I966550a3d64e9f6a66c40e062a89f39b897aaea2 --- .../android/server/soundtrigger/SoundTriggerHelper.java | 7 ++++++- .../android/test/soundtrigger/SoundTriggerTestService.java | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java index f4bb32de91ae5..bafb0a2fd6832 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java @@ -828,7 +828,12 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener { // internalClearGlobalStateLocked() cleans up the telephony and power save listeners. private void internalClearGlobalStateLocked() { // Unregister from call state changes. - mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE); + long token = Binder.clearCallingIdentity(); + try { + mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE); + } finally { + Binder.restoreCallingIdentity(token); + } // Unregister from power save mode changes. if (mPowerSaveModeListener != null) { diff --git a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestService.java b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestService.java index 00bf33ad691e4..b185a26bb9722 100644 --- a/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestService.java +++ b/tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestService.java @@ -435,9 +435,10 @@ public class SoundTriggerTestService extends Service { if (!file.getName().endsWith(".properties")) { continue; } - try { + + try (FileInputStream in = new FileInputStream(file)) { Properties properties = new Properties(); - properties.load(new FileInputStream(file)); + properties.load(in); createModelInfo(properties); loadedModel = true; } catch (Exception e) {