Api Council updates, largely merging CarConnectionCallback and ServiceConnectionCallback into one.

Test: make -j64 dist (batland)

Change-Id: I6037c1cb0fba71e558f70187790cb085289baf17

1 files changed, 6 insertions, 11 deletions

diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java
index 7e6be9ed60..28e0a5d3e7 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java
@@ -21,7 +21,7 @@ import android.support.annotation.Nullable;
 import android.support.car.Car;
 import android.support.car.CarAppFocusManager;
 import android.support.car.CarNotConnectedException;
-import android.support.car.ServiceConnectionCallback;
+import android.support.car.CarConnectionCallback;
 import android.support.car.navigation.CarNavigationStatusManager;
 import android.support.v4.app.Fragment;
 import android.util.Log;
@@ -41,10 +41,10 @@ public class InstrumentClusterFragment extends Fragment {
     private CarAppFocusManager mCarAppFocusManager;
     private Car mCarApi;
 
-    private final ServiceConnectionCallback mServiceConnectionCallback =
-            new ServiceConnectionCallback() {
+    private final CarConnectionCallback mCarConnectionCallback =
+            new CarConnectionCallback() {
                 @Override
-                public void onServiceConnected() {
+                public void onConnected(Car car) {
                     Log.d(TAG, "Connected to Car Service");
                     try {
                         mCarNavigationStatusManager = (CarNavigationStatusManager) mCarApi.getCarManager(
@@ -57,14 +57,9 @@ public class InstrumentClusterFragment extends Fragment {
                 }
 
                 @Override
-                public void onServiceDisconnected() {
+                public void onDisconnected(Car car) {
                     Log.d(TAG, "Disconnect from Car Service");
                 }
-
-                @Override
-                public void onServiceConnectionFailed() {
-                    Log.d(TAG, "Car Service connection failed");
-                }
             };
 
     private void initCarApi() {
@@ -73,7 +68,7 @@ public class InstrumentClusterFragment extends Fragment {
             mCarApi = null;
         }
 
-        mCarApi = Car.createCar(getContext(), mServiceConnectionCallback);
+        mCarApi = Car.createCar(getContext(), mCarConnectionCallback);
         mCarApi.connect();
     }