bringing in code from g3 and updating some name spaces to match

Change-Id: I0baf0d77ba2ec076e2e16849b11944907416066b

6 files changed, 31 insertions, 31 deletions

diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarApiTestBase.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarApiTestBase.java
index d0ee314d18..e4ff4a74f6 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarApiTestBase.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarApiTestBase.java
@@ -20,7 +20,7 @@ import android.content.ComponentName;
 import android.os.IBinder;
 import android.os.Looper;
 import android.support.car.Car;
-import android.support.car.ServiceConnectionListener;
+import android.support.car.ServiceConnectionCallbacks;
 import android.test.AndroidTestCase;
 
 import java.util.concurrent.Semaphore;
@@ -31,8 +31,8 @@ public class CarApiTestBase extends AndroidTestCase {
 
     private Car mCar;
 
-    private final DefaultServiceConnectionListener mConnectionListener =
-            new DefaultServiceConnectionListener();
+    private final DefaultServiceConnectionCallbacks mConnectionCallbacks =
+            new DefaultServiceConnectionCallbacks();
 
     protected void assertMainThread() {
         assertTrue(Looper.getMainLooper().isCurrentThread());
@@ -41,9 +41,9 @@ public class CarApiTestBase extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mCar = Car.createCar(getContext(), mConnectionListener);
+        mCar = Car.createCar(getContext(), mConnectionCallbacks);
         mCar.connect();
-        mConnectionListener.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
+        mConnectionCallbacks.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
     }
 
     @Override
@@ -56,7 +56,7 @@ public class CarApiTestBase extends AndroidTestCase {
         return mCar;
     }
 
-    protected class DefaultServiceConnectionListener implements ServiceConnectionListener {
+    protected class DefaultServiceConnectionCallbacks implements ServiceConnectionCallbacks {
         private final Semaphore mConnectionWait = new Semaphore(0);
 
         public void waitForConnection(long timeoutMs) throws InterruptedException {
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppFocusManagerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppFocusManagerTest.java
index 0793f9d06e..e9231b9489 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppFocusManagerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarAppFocusManagerTest.java
@@ -70,11 +70,11 @@ public class CarAppFocusManagerTest extends CarApiTestBase {
     }
 
     public void testFocusChange() throws Exception {
-        DefaultServiceConnectionListener connectionListener =
-                new DefaultServiceConnectionListener();
-        Car car2 = Car.createCar(getContext(), connectionListener, null);
+        DefaultServiceConnectionCallbacks ConnectionCallbacks =
+                new DefaultServiceConnectionCallbacks();
+        Car car2 = Car.createCar(getContext(), ConnectionCallbacks, null);
         car2.connect();
-        connectionListener.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
+        ConnectionCallbacks.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
         CarAppFocusManager manager2 = (CarAppFocusManager)
                 car2.getCarManager(Car.APP_FOCUS_SERVICE);
         assertNotNull(manager2);
@@ -167,11 +167,11 @@ public class CarAppFocusManagerTest extends CarApiTestBase {
     }
 
     public void testFilter() throws Exception {
-        DefaultServiceConnectionListener connectionListener =
-                new DefaultServiceConnectionListener();
-        Car car2 = Car.createCar(getContext(), connectionListener);
+        DefaultServiceConnectionCallbacks ConnectionCallbacks =
+                new DefaultServiceConnectionCallbacks();
+        Car car2 = Car.createCar(getContext(), ConnectionCallbacks);
         car2.connect();
-        connectionListener.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
+        ConnectionCallbacks.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
         CarAppFocusManager manager2 = (CarAppFocusManager)
                 car2.getCarManager(Car.APP_FOCUS_SERVICE);
         assertNotNull(manager2);
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarConnectionListenerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarConnectionCallbacksTest.java
index 4792758ad4..1da9db5e70 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarConnectionListenerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarConnectionCallbacksTest.java
@@ -17,7 +17,7 @@
 package com.android.support.car.apitest;
 
 import android.support.car.Car;
-import android.support.car.CarConnectionListener;
+import android.support.car.CarConnectionCallbacks;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 
@@ -25,21 +25,21 @@ import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 
 @MediumTest
-public class CarConnectionListenerTest extends CarApiTestBase {
-    private static final String TAG = CarConnectionListenerTest.class.getSimpleName();
+public class CarConnectionCallbacksTest extends CarApiTestBase {
+    private static final String TAG = CarConnectionCallbacksTest.class.getSimpleName();
 
     public void testRegisterUnregister() throws Exception {
-        CarConnectionListerImpl listener = new CarConnectionListerImpl();
+        CarConnectionCallbacksImpl listener = new CarConnectionCallbacksImpl();
         getCar().registerCarConnectionListener(listener);
         assertTrue(listener.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS));
         getCar().unregisterCarConnectionListener(listener);
     }
 
     public void testMultiple() throws Exception {
-        CarConnectionListerImpl listener1 = new CarConnectionListerImpl();
+        CarConnectionCallbacksImpl listener1 = new CarConnectionCallbacksImpl();
         getCar().registerCarConnectionListener(listener1);
         assertTrue(listener1.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS));
-        CarConnectionListerImpl listener2 = new CarConnectionListerImpl();
+        CarConnectionCallbacksImpl listener2 = new CarConnectionCallbacksImpl();
         getCar().registerCarConnectionListener(listener2);
         assertTrue(listener2.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS));
         assertFalse(listener1.waitForConnection(DEFAULT_WAIT_TIMEOUT_MS));
@@ -47,7 +47,7 @@ public class CarConnectionListenerTest extends CarApiTestBase {
         getCar().unregisterCarConnectionListener(listener1);
     }
 
-    private class CarConnectionListerImpl implements CarConnectionListener {
+    private class CarConnectionCallbacksImpl extends CarConnectionCallbacks {
         int mConnectionType;
         boolean mIsConnected = false;
         private Semaphore mWaitSemaphore = new Semaphore(0);
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarPackageManagerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarPackageManagerTest.java
index 939e5bd659..bc09f3fb03 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarPackageManagerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarPackageManagerTest.java
@@ -19,7 +19,7 @@ package com.android.support.car.apitest;
 import android.content.ComponentName;
 import android.os.Looper;
 import android.support.car.Car;
-import android.support.car.ServiceConnectionListener;
+import android.support.car.ServiceConnectionCallbacks;
 import android.support.car.content.pm.CarPackageManager;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -36,7 +36,7 @@ public class CarPackageManagerTest extends AndroidTestCase {
     private Car mCar;
     private CarPackageManager mCarPackageManager;
 
-    private final ServiceConnectionListener mConnectionListener = new ServiceConnectionListener() {
+    private final ServiceConnectionCallbacks mConnectionCallbacks = new ServiceConnectionCallbacks() {
 
         @Override
         public void onServiceSuspended(int cause) {
@@ -70,7 +70,7 @@ public class CarPackageManagerTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mCar = Car.createCar(getContext(), mConnectionListener);
+        mCar = Car.createCar(getContext(), mConnectionCallbacks);
         mCar.connect();
         waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
         mCarPackageManager = (CarPackageManager) mCar.getCarManager(Car.PACKAGE_SERVICE);
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java
index 2a04c59db1..e4ef133d73 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java
@@ -20,7 +20,7 @@ import android.content.ComponentName;
 import android.os.IBinder;
 import android.os.Looper;
 import android.support.car.Car;
-import android.support.car.ServiceConnectionListener;
+import android.support.car.ServiceConnectionCallbacks;
 import android.support.car.hardware.CarSensorEvent;
 import android.support.car.hardware.CarSensorManager;
 import android.test.AndroidTestCase;
@@ -42,7 +42,7 @@ public class CarSensorManagerTest extends AndroidTestCase {
     private Car mCar;
     private CarSensorManager mCarSensorManager;
 
-    private final ServiceConnectionListener mConnectionListener = new ServiceConnectionListener() {
+    private final ServiceConnectionCallbacks mConnectionCallbacks = new ServiceConnectionCallbacks() {
 
         @Override
         public void onServiceSuspended(int cause) {
@@ -76,7 +76,7 @@ public class CarSensorManagerTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mCar = Car.createCar(getContext(), mConnectionListener);
+        mCar = Car.createCar(getContext(), mConnectionCallbacks);
         mCar.connect();
         waitForConnection(DEFAULT_WAIT_TIMEOUT_MS);
         mCarSensorManager =
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarTest.java
index 6d7ef0ef48..6f4f21cc05 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarTest.java
@@ -19,7 +19,7 @@ package com.android.support.car.apitest;
 import android.content.ComponentName;
 import android.os.Looper;
 import android.support.car.Car;
-import android.support.car.ServiceConnectionListener;
+import android.support.car.ServiceConnectionCallbacks;
 import android.support.car.hardware.CarSensorManager;
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
@@ -33,7 +33,7 @@ public class CarTest extends AndroidTestCase {
 
     private final Semaphore mConnectionWait = new Semaphore(0);
 
-    private final ServiceConnectionListener mConnectionListener = new ServiceConnectionListener() {
+    private final ServiceConnectionCallbacks mConnectionCallbacks = new ServiceConnectionCallbacks() {
 
         @Override
         public void onServiceSuspended(int cause) {
@@ -66,7 +66,7 @@ public class CarTest extends AndroidTestCase {
     }
 
     public void testCarConnection() throws Exception {
-        Car car = Car.createCar(getContext(), mConnectionListener);
+        Car car = Car.createCar(getContext(), mConnectionCallbacks);
         assertFalse(car.isConnected());
         assertFalse(car.isConnecting());
         car.connect();
@@ -91,7 +91,7 @@ public class CarTest extends AndroidTestCase {
     }
 
     public void testDoubleConnect() throws Exception {
-        Car car = Car.createCar(getContext(), mConnectionListener);
+        Car car = Car.createCar(getContext(), mConnectionCallbacks);
         assertFalse(car.isConnected());
         assertFalse(car.isConnecting());
         car.connect();