resolve merge conflicts of 235f8ac to nyc-car-dev

Change-Id: I49327e591ef08875a92928535a1a0c69f7368804

1 files changed, 7 insertions, 3 deletions

diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
index 903b436f9b..88270da116 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -146,7 +146,11 @@ public class KitchenSinkActivity extends CarDrawerActivity {
     protected void onDestroy() {
         super.onDestroy();
         if (mCarSensorManager != null) {
-            mCarSensorManager.unregisterListener(mListener);
+            try {
+                mCarSensorManager.unregisterListener(mListener);
+            } catch (CarNotConnectedException e) {
+                Log.e(TAG, "Failed to unregister car seonsor listener", e);
+            }
         }
         if (mCarApi != null) {
             mCarApi.disconnect();
@@ -176,9 +180,9 @@ public class KitchenSinkActivity extends CarDrawerActivity {
                 mCarAppContextManager =
                         (CarAppContextManager) mCarApi.getCarManager(Car.APP_CONTEXT_SERVICE);
             } catch (CarNotConnectedException e) {
-                Log.e(TAG, "Car is not connected!");
+                Log.e(TAG, "Car is not connected!", e);
             } catch (CarNotSupportedException e) {
-                Log.e(TAG, "Car is not supported!");
+                Log.e(TAG, "Car is not supported!", e);
             }
         }