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

Commit 6f71685d authored by Atneya Nair's avatar Atneya Nair Committed by Automerger Merge Worker
Browse files

Merge "Remove abort on exception in STService" into udc-dev am: 4d8929c5 am: ab9954ec 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22505322



Change-Id: I58ad340d28d619c7da7120af8f993237d5bc7410
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 02970b32 ab9954ec

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+0 −16
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.IBinder;

import android.os.Looper;

import android.os.Parcel;

import android.os.ParcelUuid;

import android.os.PowerManager;

import android.os.RemoteException;
@@ -341,21 +340,6 @@ public class SoundTriggerService extends SystemService { 
            }

        }



        @Override

        public boolean onTransact(int code, Parcel data, Parcel reply, int flags)

                throws RemoteException {

            try {

                return super.onTransact(code, data, reply, flags);

            } catch (RuntimeException e) {

                // The activity manager only throws security exceptions, so let's

                // log all others.

                if (!(e instanceof SecurityException)) {

                    Slog.wtf(TAG, "SoundTriggerService Crash", e);

                }

                throw e;

            }

        }



        @Override

        public int startRecognition(GenericSoundModel soundModel,

                IRecognitionStatusCallback callback,