commit c889a862b5045e085ed720ccf55b3cf80bd929a9
author Kai Wang <kwangsudo@google.com> Wed Jan 30 19:50:36 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 30 19:50:36 2019 +0000
tree 06f42ecadc440a30844a6fb14973af2b37c1a9b7
parent aae12047e14bd97141cc7d08f9f97d3755c3b786
parent b140f340d022dc0e3e0583014a4eef5b6c666a3e

Merge "Fix setting STATE_DISCONNECTED twice"

car-lib/src/android/car/Car.java

diff --git a/car-lib/src/android/car/Car.java b/car-lib/src/android/car/Car.java
index 4a980af..673aec4 100644
--- a/car-lib/src/android/car/Car.java
+++ b/car-lib/src/android/car/Car.java
@@ -548,13 +548,11 @@
 
         public void onServiceDisconnected(ComponentName name) {
             synchronized (Car.this) {
-                mService = null;
                 if (mConnectionState  == STATE_DISCONNECTED) {
                     return;
                 }
-                mConnectionState = STATE_DISCONNECTED;
             }
-            // unbind explicitly here.
+            // unbind explicitly and set connectionState to STATE_DISCONNECTED here.
             disconnect();
             mServiceConnectionListenerClient.onServiceDisconnected(name);
         }