commit 837ba261715813d9bde39a9861a0e99199b2ec82
author Ian Rogers <irogers@google.com> Thu Mar 17 17:20:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 17 17:20:58 2016 +0000
tree cb7cbd988a8567977a12bc070f373fb033f65110
parent a3229b9c488c149a6e498af8d8d8cc2150ead6a1
parent 400229b44ff91b95e03732be350bf6ca63f6720d

Merge "Add missing lock discovered by GuardedBy checker." am: a2ee440
am: 400229b

* commit '400229b44ff91b95e03732be350bf6ca63f6720d':
  Add missing lock discovered by GuardedBy checker.

src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java

diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
index e5efbec..d4d294e 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
@@ -133,6 +133,7 @@
             }
         }
 
+        @GuardedBy("mLock")
         private void cancelPendingRunnables() {
             if (mScheduledFuture != null) {
                 mScheduledFuture.cancel(true);