API review: Add CarNotConnectedException to APIs.

Bug: 27378263
Change-Id: I73192458847c31c726ee63bbece32f4ca2815e2e

1 files changed, 15 insertions, 12 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 f2e6e0ea48..d227486693 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -16,14 +16,6 @@
 
 package com.google.android.car.kitchensink;
 
-import com.google.android.car.kitchensink.audio.AudioTestFragment;
-import com.google.android.car.kitchensink.camera.CameraTestFragment;
-import com.google.android.car.kitchensink.cluster.InstrumentClusterFragment;
-import com.google.android.car.kitchensink.hvac.HvacTestFragment;
-import com.google.android.car.kitchensink.input.InputTestFragment;
-import com.google.android.car.kitchensink.job.JobSchedulerFragment;
-import com.google.android.car.kitchensink.keyboard.KeyboardFragment;
-
 import android.car.hardware.camera.CarCameraManager;
 import android.car.hardware.hvac.CarHvacManager;
 import android.content.ComponentName;
@@ -31,7 +23,6 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.os.IBinder;
 import android.support.car.Car;
 import android.support.car.CarAppContextManager;
 import android.support.car.CarNotConnectedException;
@@ -46,6 +37,14 @@ import android.support.car.hardware.CarSensorManager;
 import android.support.car.navigation.CarNavigationManager;
 import android.util.Log;
 
+import com.google.android.car.kitchensink.audio.AudioTestFragment;
+import com.google.android.car.kitchensink.camera.CameraTestFragment;
+import com.google.android.car.kitchensink.cluster.InstrumentClusterFragment;
+import com.google.android.car.kitchensink.hvac.HvacTestFragment;
+import com.google.android.car.kitchensink.input.InputTestFragment;
+import com.google.android.car.kitchensink.job.JobSchedulerFragment;
+import com.google.android.car.kitchensink.keyboard.KeyboardFragment;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -144,7 +143,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();
@@ -174,9 +177,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);
             }
         }