diff options
author | rleix | 2018-12-10 17:39:15 -0600 |
---|---|---|
committer | android-build-merger | 2018-12-10 17:39:15 -0600 |
commit | 07d16e3cdcf0f939f790d1a630704c020899a267 (patch) | |
tree | dda992a02cda1b27e116b50a8258415e37d51d60 | |
parent | d9892c1ce65f5ac48118b345be4ca769ca8444c6 (diff) | |
parent | 6379090b6eebf55cb744aea3ebb43b5b61acb50f (diff) | |
download | platform-packages-services-car-07d16e3cdcf0f939f790d1a630704c020899a267.tar.gz platform-packages-services-car-07d16e3cdcf0f939f790d1a630704c020899a267.tar.xz platform-packages-services-car-07d16e3cdcf0f939f790d1a630704c020899a267.zip |
Merge "Add cleanup upon disconnect of CarService"
am: 6379090b6e
Change-Id: Ie16e3f39eb1c7791348812ba69e847fe665f8a2d
-rw-r--r-- | car-lib/src/android/car/vms/VmsSubscriberManager.java | 10 | ||||
-rw-r--r-- | tests/VmsSubscriberClientSample/src/com/google/android/car/vms/subscriber/VmsSubscriberClientSampleActivity.java | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/car-lib/src/android/car/vms/VmsSubscriberManager.java b/car-lib/src/android/car/vms/VmsSubscriberManager.java index fe9e8c36..1416b417 100644 --- a/car-lib/src/android/car/vms/VmsSubscriberManager.java +++ b/car-lib/src/android/car/vms/VmsSubscriberManager.java | |||
@@ -155,11 +155,11 @@ public final class VmsSubscriberManager implements CarManagerBase { | |||
155 | } catch (RemoteException e) { | 155 | } catch (RemoteException e) { |
156 | Log.e(TAG, "Could not connect: ", e); | 156 | Log.e(TAG, "Could not connect: ", e); |
157 | throw new CarNotConnectedException(e); | 157 | throw new CarNotConnectedException(e); |
158 | } | 158 | } finally { |
159 | 159 | synchronized (mClientCallbackLock) { | |
160 | synchronized (mClientCallbackLock) { | 160 | mClientCallback = null; |
161 | mClientCallback = null; | 161 | mExecutor = null; |
162 | mExecutor = null; | 162 | } |
163 | } | 163 | } |
164 | } | 164 | } |
165 | 165 | ||
diff --git a/tests/VmsSubscriberClientSample/src/com/google/android/car/vms/subscriber/VmsSubscriberClientSampleActivity.java b/tests/VmsSubscriberClientSample/src/com/google/android/car/vms/subscriber/VmsSubscriberClientSampleActivity.java index a82350b4..d1b92dcb 100644 --- a/tests/VmsSubscriberClientSample/src/com/google/android/car/vms/subscriber/VmsSubscriberClientSampleActivity.java +++ b/tests/VmsSubscriberClientSample/src/com/google/android/car/vms/subscriber/VmsSubscriberClientSampleActivity.java | |||
@@ -84,6 +84,14 @@ public class VmsSubscriberClientSampleActivity extends Activity { | |||
84 | @Override | 84 | @Override |
85 | public void onDisconnected(Car car) { | 85 | public void onDisconnected(Car car) { |
86 | Log.d(TAG, "Disconnect from Car Service"); | 86 | Log.d(TAG, "Disconnect from Car Service"); |
87 | if (mVmsSubscriberManager != null) { | ||
88 | try { | ||
89 | mVmsSubscriberManager.clearVmsSubscriberClientCallback(); | ||
90 | mVmsSubscriberManager.unsubscribe(TEST_LAYER); | ||
91 | } catch (android.car.CarNotConnectedException e) { | ||
92 | Log.e(TAG, "Car is not connected!", e); | ||
93 | } | ||
94 | } | ||
87 | } | 95 | } |
88 | 96 | ||
89 | private VmsSubscriberManager getVmsSubscriberManager() { | 97 | private VmsSubscriberManager getVmsSubscriberManager() { |