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

Commit 57af3803 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Properly disconnect after skipping an operation." into pi-dev 

am: cd7a174c

Change-Id: Ida1308d4746001e818177bf6cdbfa0ec85a2afe2
parents 035b4827 cd7a174c

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

+15 −16
Original line number Diff line number Diff line
@@ -926,9 +926,7 @@ public class SoundTriggerService extends SystemService { 
                            Slog.w(TAG, mPuuid + ": Dropped operation as too many operations were "

                                    + "run in last 24 hours");

                        }

                        return;

                    }



                    } else {

                        mNumOps.addOp(currentTime);



                        // Find a free opID
@@ -946,6 +944,7 @@ public class SoundTriggerService extends SystemService { 
                        } catch (Exception e) {

                            Slog.e(TAG, mPuuid + ": Could not run operation " + opId, e);

                        }

                    }



                    // Unbind from service if no operations are left (i.e. if the operation failed)

                    if (mPendingOps.isEmpty() && mRunningOpIds.isEmpty()) {