Fixed model and make values in AutomotiveCarInfo.java.

Fix: 201004136
Test: atest
Change-Id: Ia81fb6bc9e1f647f5318af881e4b4bb42ff587af

diff --git a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/info/AutomotiveCarInfo.java b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/info/AutomotiveCarInfo.java
index 3e2db72..7712336c 100644
--- a/car/app/app-automotive/src/main/java/androidx/car/app/hardware/info/AutomotiveCarInfo.java
+++ b/car/app/app-automotive/src/main/java/androidx/car/app/hardware/info/AutomotiveCarInfo.java

@@ -287,8 +287,8 @@
                         yearValue = getCarValue(value, (Integer) value.getValue());
                     }
                 }
-                Model model = new Model.Builder().setName(makeValue)
-                        .setManufacturer(modelValue)
+                Model model = new Model.Builder().setName(modelValue)
+                        .setManufacturer(makeValue)
                         .setYear(yearValue)
                         .build();
                 listener.onCarDataAvailable(model);

diff --git a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
index 9919320..56be908 100644
--- a/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java
+++ b/car/app/app-automotive/src/test/java/androidx/car/app/hardware/info/AutomotiveCarInfoTest.java

@@ -87,7 +87,7 @@
 public class AutomotiveCarInfoTest {
     private List<CarPropertyResponse<?>> mResponse;
     private CountDownLatch mCountDownLatch;
-    private Executor mExecutor = directExecutor();
+    private final Executor mExecutor = directExecutor();
     private AutomotiveCarInfo mAutomotiveCarInfo;
     @Mock
     private Car mCarMock;
@@ -110,11 +110,9 @@
     public void getModel_verifyResponse() throws InterruptedException {
         // Add "make", "model", "year" values to the response.
         mResponse.add(CarPropertyResponse.create(INFO_MAKE,
-                STATUS_SUCCESS, 1, "Speedy "
-                        + "Model"));
+                STATUS_SUCCESS, 1, "Toy Vehicle"));
         mResponse.add(CarPropertyResponse.create(INFO_MODEL,
-                STATUS_SUCCESS, 2, "Toy "
-                        + "Vehicle"));
+                STATUS_SUCCESS, 2, "Speedy Model"));
         mResponse.add(CarPropertyResponse.create(INFO_MODEL_YEAR,
                 STATUS_SUCCESS, 3, 2020));
         ListenableFuture<List<CarPropertyResponse<?>>> listenableCarPropertyResponse =
@@ -133,8 +131,8 @@
         assertThat(mModel.getName().getValue()).isEqualTo("Speedy Model");
         assertThat(mModel.getManufacturer().getValue()).isEqualTo("Toy Vehicle");
         assertThat(mModel.getYear().getValue()).isEqualTo(2020);
-        assertThat(mModel.getName().getTimestampMillis()).isEqualTo(1);
-        assertThat(mModel.getManufacturer().getTimestampMillis()).isEqualTo(2);
+        assertThat(mModel.getManufacturer().getTimestampMillis()).isEqualTo(1);
+        assertThat(mModel.getName().getTimestampMillis()).isEqualTo(2);
         assertThat(mModel.getYear().getTimestampMillis()).isEqualTo(3);
     }