Merge "Properly disconnect after skipping an operation." into pi-dev (cd7a174c) · Commits · e / os / android_frameworks_base

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()) {