From be3066134995ce25aa2b2f4d3bc9009e22d255f8 Mon Sep 17 00:00:00 2001 From: mike dooley Date: Wed, 9 May 2018 13:21:29 +0200 Subject: [PATCH] Don't crash if SoundTriggerDetectionService client is gone or if there is a remote exception while finishing an opperation Test: built Bug: 78137044 Change-Id: I4bc92f8688c2269178d101d95946f4835ab7c6a5 --- .../media/soundtrigger/SoundTriggerDetectionService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/soundtrigger/SoundTriggerDetectionService.java b/media/java/android/media/soundtrigger/SoundTriggerDetectionService.java index 7381d977b7b5a..55cd1ab9823a4 100644 --- a/media/java/android/media/soundtrigger/SoundTriggerDetectionService.java +++ b/media/java/android/media/soundtrigger/SoundTriggerDetectionService.java @@ -191,13 +191,14 @@ public abstract class SoundTriggerDetectionService extends Service { client = mClients.get(uuid); 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?"); + return; } } client.onOpFinished(opId); } catch (RemoteException e) { - e.rethrowFromSystemServer(); + Log.e(LOG_TAG, "operationFinished, remote exception for client " + uuid, e); } }