summaryrefslogtreecommitdiff
path: root/src/com
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2016-03-17 17:20:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-17 17:20:58 +0000
commit837ba261715813d9bde39a9861a0e99199b2ec82 (patch)
treecb7cbd988a8567977a12bc070f373fb033f65110 /src/com
parenta3229b9c488c149a6e498af8d8d8cc2150ead6a1 (diff)
parent400229b44ff91b95e03732be350bf6ca63f6720d (diff)
Merge "Add missing lock discovered by GuardedBy checker." am: a2ee440
am: 400229b * commit '400229b44ff91b95e03732be350bf6ca63f6720d': Add missing lock discovered by GuardedBy checker.
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
index e5efbeca3..d4d294e8d 100644
--- a/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
+++ b/src/com/android/dialer/voicemail/VoicemailPlaybackLayout.java
@@ -133,6 +133,7 @@ public class VoicemailPlaybackLayout extends LinearLayout
}
}
+ @GuardedBy("mLock")
private void cancelPendingRunnables() {
if (mScheduledFuture != null) {
mScheduledFuture.cancel(true);