commit 8ce7ed95a0f1eca6a425a7795f0709652f43355a
author Andreas Gampe <agampe@google.com> Wed Sep 05 16:53:00 2018 -0700
committer Andreas Gampe <agampe@google.com> Wed Sep 05 17:02:08 2018 -0700
tree 3a95bdc4827c89ffc01091656a045223bb32dc50
parent 22f9af73dbb11c4012b60cae4a1855155c98df21

Frameworks: Annotate trivial @GuardedBy in services

Add @GuardedBy for simple functions that require locks and have a name in
one of the frameworks naming styles for locks ("^.*(Locked|LPw|LPr|L[a-zA-Z]|UL|AL|NL)$").

Derived by errorprone.

Bug: 73000847
Test: m
Change-Id: If70bb03313388af34d547efca20fb5115de95bf1

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

diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
index de17716..7c22613 100644
--- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
+++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java
@@ -670,6 +670,7 @@
         /**
          * Disconnect from the service, but allow to re-connect when new operations are triggered.
          */
+        @GuardedBy("mRemoteServiceLock")
         private void disconnectLocked() {
             if (mService != null) {
                 try {