commit 810766f860133d7a5ee3a50f4bc90f3e1e6b2785
author Keun young Park <keunyoung@google.com> Tue Apr 21 11:25:30 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 21 11:25:30 2020 +0000
tree 333dc2c9fe3ff244563024469a924b4d50c34d5a
parent d67bb2a4a8989fd669596ce5b4e5d49f719391de
parent 5a3fd5faae2b0ef4b3e01c9a57495450acd74c16

Release heavier objects in teardown am: 5a3fd5faae

Change-Id: I06c6fae7f28025e065462e24f58d9cc4006a8ddb

tests/carservice_test/src/com/android/car/MockedCarTestBase.java

diff --git a/tests/carservice_test/src/com/android/car/MockedCarTestBase.java b/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
index f845972..729c32b 100644
--- a/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
+++ b/tests/carservice_test/src/com/android/car/MockedCarTestBase.java
@@ -210,13 +210,16 @@
     public void tearDown() throws Exception {
         if (mCar != null) {
             mCar.disconnect();
+            mCar = null;
         }
         if (mCarImpl != null) {
             mCarImpl.release();
+            mCarImpl = null;
         }
         if (mMockIOInterface != null) {
             mMockIOInterface.tearDown();
         }
+        mMockedVehicleHal = null;
     }
 
     public CarPropertyService getCarPropertyService() {