diff options
author | Jason Tholstrup <jthol@google.com> | 2016-11-01 17:59:38 -0700 |
---|---|---|
committer | Jason Tholstrup <jthol@google.com> | 2016-11-08 17:37:58 -0800 |
commit | ed493f7ffcfaf46819913825a4edddde7736b429 (patch) | |
tree | 3fb241e13e0a8c0afa36941182cb623c31548117 /tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java | |
parent | e44e0fb7baee22d677b6a78b815832bbfc353122 (diff) | |
download | Car-ed493f7ffcfaf46819913825a4edddde7736b429.tar.gz |
Api Council updates, largely merging CarConnectionCallback and ServiceConnectionCallback into one.
Test: make -j64 dist (batland)
Change-Id: I6037c1cb0fba71e558f70187790cb085289baf17
Diffstat (limited to 'tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java')
-rw-r--r-- | tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java | 17 |
1 files changed, 6 insertions, 11 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 3f4f6f9421..f31cd26f9d 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java @@ -26,7 +26,7 @@ import android.os.Bundle; 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.app.menu.CarDrawerActivity; import android.support.car.app.menu.CarMenu; import android.support.car.app.menu.CarMenuCallbacks; @@ -123,7 +123,7 @@ public class KitchenSinkActivity extends CarDrawerActivity { // Connection to Car Service does not work for non-automotive yet. if (getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) { - mCarApi = Car.createCar(getContext(), mServiceConnectionCallback); + mCarApi = Car.createCar(getContext(), mCarConnectionCallback); mCarApi.connect(); } Log.i(TAG, "onCreate"); @@ -181,10 +181,10 @@ public class KitchenSinkActivity extends CarDrawerActivity { .commit(); } - 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 { mCameraManager = (CarCameraManager) mCarApi.getCarManager(android.car.Car @@ -202,14 +202,9 @@ public class KitchenSinkActivity extends CarDrawerActivity { } @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 final class MyCarMenuCallbacks extends CarMenuCallbacks { |