Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74b68635 authored by Michael Dooley's avatar Michael Dooley Committed by Android (Google) Code Review
Browse files

Merge "Don't crash if SoundTriggerDetectionService client is gone or if there... 

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

media/java/android/media/soundtrigger/SoundTriggerDetectionService.java

+3 −2
Original line number Diff line number Diff line
@@ -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);

        }

    }