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

Merge "Don't crash if SoundTriggerDetectionService client is gone or if there is a remote exception while finishing an opperation" into pi-dev

Browse Source 
am: 74b6863504

Change-Id: I5b95c04240b85b2358c8e120a563a4d6a3bb9ce6
This commit is contained in:
Michael Dooley
2018-05-11 11:29:19 -07:00
committed by android-build-merger
parent f08b40642a 74b6863504
commit ce408cbce7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/soundtrigger/SoundTriggerDetectionService.java
View File

@@ -191,13 +191,14 @@ public abstract class SoundTriggerDetectionService extends Service {
client = mClients.get(uuid); client = mClients.get(uuid);
if (client == null) { if (client == null) {
throw new IllegalStateException("operationFinished called, but no client for " Log.w(LOG_TAG, "operationFinished called, but no client for "
+ uuid + ". Was this called after onDisconnected?"); + uuid + ". Was this called after onDisconnected?");
return;
} }
} }
client.onOpFinished(opId); client.onOpFinished(opId);
} catch (RemoteException e) { } catch (RemoteException e) {
e.rethrowFromSystemServer(); Log.e(LOG_TAG, "operationFinished, remote exception for client " + uuid, e);
} }
} }