Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixing a couple crashes in the SoundTriggerTestApp" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-10 06:57:32 +00:00
committed by Android (Google) Code Review
parent b0e503f96d cabbb11c01
commit 67890e0e1d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java
View File

@@ -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) {

5
tests/SoundTriggerTestApp/src/com/android/test/soundtrigger/SoundTriggerTestService.java
View File

@@ -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) {