diff options
| author | Eric Jeong <ericjeong@google.com> | 2020-05-27 18:19:55 -0700 |
|---|---|---|
| committer | Eric Jeong <ericjeong@google.com> | 2020-05-28 10:13:28 -0700 |
| commit | aa5a652203ecd26240f0b50094b19d193dc9d68e (patch) | |
| tree | ccc91766e12d9d70e0b40905343cda2918582193 /experimental | |
| parent | fa32ab3c03a4e832cdb2bdd5234d810fa75aa563 (diff) | |
| download | Car-aa5a652203ecd26240f0b50094b19d193dc9d68e.tar.gz | |
Make sure that car is disconnected
Bug: 148534153
Test: Build okay
Change-Id: I01c857caffd9aebd4156994d6e405a72aad0b5a6
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/service/src/com/android/experimentalcar/ExperimentalCarService.java | 4 | ||||
| -rw-r--r-- | experimental/service/src/com/android/experimentalcar/GazeDriverAwarenessSupplier.java | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/experimental/service/src/com/android/experimentalcar/ExperimentalCarService.java b/experimental/service/src/com/android/experimentalcar/ExperimentalCarService.java index bc40af5b93..065f8e9c4b 100644 --- a/experimental/service/src/com/android/experimentalcar/ExperimentalCarService.java +++ b/experimental/service/src/com/android/experimentalcar/ExperimentalCarService.java @@ -42,6 +42,10 @@ public class ExperimentalCarService extends Service { @Override public void onDestroy() { mIExperimentalCarImpl.release(); + if (mCar != null && mCar.isConnected()) { + mCar.disconnect(); + mCar = null; + } super.onDestroy(); } diff --git a/experimental/service/src/com/android/experimentalcar/GazeDriverAwarenessSupplier.java b/experimental/service/src/com/android/experimentalcar/GazeDriverAwarenessSupplier.java index aeb31e7ef8..bd980bd257 100644 --- a/experimental/service/src/com/android/experimentalcar/GazeDriverAwarenessSupplier.java +++ b/experimental/service/src/com/android/experimentalcar/GazeDriverAwarenessSupplier.java @@ -87,6 +87,16 @@ public class GazeDriverAwarenessSupplier extends DriverAwarenessSupplierService } } + @Override + public void onDestroy() { + synchronized (mLock) { + if (mCar != null && mCar.isConnected()) { + mCar.disconnect(); + } + } + super.onDestroy(); + } + /** * Gets the self-reported maximum allowable staleness before the supplier should be considered * failed, in milliseconds. |