From 5aaca3a6201d8c043122cae836e927d101384b86 Mon Sep 17 00:00:00 2001
From: Felipe Leme <felipeal@google.com>
Date: Wed, 19 Oct 2016 15:23:08 -0700
Subject: [PATCH] Synchronized access to mService.

Test: none
Change-Id: Ibab1211384c1c579fa24be19821c2784faa22b8c
---
 .../server/voiceinteraction/VoiceInteractionSessionConnection.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
index c3075b3daa3e..e58fe700f3ea 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionSessionConnection.java
@@ -570,7 +570,9 @@ final class VoiceInteractionSessionConnection implements ServiceConnection {
     @Override
     public void onServiceDisconnected(ComponentName name) {
         mCallback.sessionConnectionGone(this);
-        mService = null;
+        synchronized (mLock) {
+            mService = null;
+        }
     }
 
     public void dump(String prefix, PrintWriter pw) {
-- 
2.11.0