Created TIRAMISU_x constants on CarApiVersion and PlatformApiVersion.
Test: m -j update-api
Test: atest android.car.apitest.CarApiVersionTest \
android.car.apitest.PlatformApiVersionTest
Bug: 228506662
Change-Id: Ibca2bc010b546337a547dcbc549a8fc6548848c2
diff --git a/car-lib-module/api/current.txt b/car-lib-module/api/current.txt
index 141ed4b..f07406b 100644
--- a/car-lib-module/api/current.txt
+++ b/car-lib-module/api/current.txt
@@ -76,6 +76,8 @@
public final class CarApiVersion extends android.car.ApiVersion<android.car.CarApiVersion> {
method @NonNull public static android.car.CarApiVersion forMajorAndMinorVersions(int, int);
method @NonNull public static android.car.CarApiVersion forMajorVersion(int);
+ field @NonNull public static final android.car.CarApiVersion TIRAMISU_0;
+ field @NonNull public static final android.car.CarApiVersion TIRAMISU_1;
}
public final class CarAppFocusManager {
@@ -193,6 +195,8 @@
public final class PlatformApiVersion extends android.car.ApiVersion<android.car.PlatformApiVersion> {
method @NonNull public static android.car.PlatformApiVersion forMajorAndMinorVersions(int, int);
method @NonNull public static android.car.PlatformApiVersion forMajorVersion(int);
+ field @NonNull public static final android.car.PlatformApiVersion TIRAMISU_0;
+ field @NonNull public static final android.car.PlatformApiVersion TIRAMISU_1;
}
public final class PortLocationType {
diff --git a/car-lib/api/current.txt b/car-lib/api/current.txt
index 141ed4b..f07406b 100644
--- a/car-lib/api/current.txt
+++ b/car-lib/api/current.txt
@@ -76,6 +76,8 @@
public final class CarApiVersion extends android.car.ApiVersion<android.car.CarApiVersion> {
method @NonNull public static android.car.CarApiVersion forMajorAndMinorVersions(int, int);
method @NonNull public static android.car.CarApiVersion forMajorVersion(int);
+ field @NonNull public static final android.car.CarApiVersion TIRAMISU_0;
+ field @NonNull public static final android.car.CarApiVersion TIRAMISU_1;
}
public final class CarAppFocusManager {
@@ -193,6 +195,8 @@
public final class PlatformApiVersion extends android.car.ApiVersion<android.car.PlatformApiVersion> {
method @NonNull public static android.car.PlatformApiVersion forMajorAndMinorVersions(int, int);
method @NonNull public static android.car.PlatformApiVersion forMajorVersion(int);
+ field @NonNull public static final android.car.PlatformApiVersion TIRAMISU_0;
+ field @NonNull public static final android.car.PlatformApiVersion TIRAMISU_1;
}
public final class PortLocationType {
diff --git a/car-lib/src/android/car/CarApiVersion.java b/car-lib/src/android/car/CarApiVersion.java
index 32e178b..a5f524c 100644
--- a/car-lib/src/android/car/CarApiVersion.java
+++ b/car-lib/src/android/car/CarApiVersion.java
@@ -17,6 +17,7 @@
import android.annotation.NonNull;
import android.car.annotation.AddedIn;
+import android.os.Build;
/**
* Represents the API version of the {@code Car} SDK.
@@ -25,6 +26,22 @@
public final class CarApiVersion extends ApiVersion<CarApiVersion> {
/**
+ * Helper object for main version of Android 13.
+ */
+ @AddedIn(majorVersion = 33, minorVersion = 1)
+ @NonNull
+ public static final CarApiVersion TIRAMISU_0 =
+ forMajorAndMinorVersions(Build.VERSION_CODES.TIRAMISU, 0);
+
+ /**
+ * Helper object for first minor upgrade of Android 13.
+ */
+ @AddedIn(majorVersion = 33, minorVersion = 1)
+ @NonNull
+ public static final CarApiVersion TIRAMISU_1 =
+ forMajorAndMinorVersions(Build.VERSION_CODES.TIRAMISU, 1);
+
+ /**
* Creates a new instance with the given major and minor versions.
*/
@AddedIn(majorVersion = 33, minorVersion = 1)
diff --git a/car-lib/src/android/car/PlatformApiVersion.java b/car-lib/src/android/car/PlatformApiVersion.java
index 98d45d0..9ffa83a 100644
--- a/car-lib/src/android/car/PlatformApiVersion.java
+++ b/car-lib/src/android/car/PlatformApiVersion.java
@@ -17,6 +17,7 @@
import android.annotation.NonNull;
import android.car.annotation.AddedIn;
+import android.os.Build;
/**
* Represents the API version of the standard Android SDK.
@@ -25,6 +26,22 @@
public final class PlatformApiVersion extends ApiVersion<PlatformApiVersion> {
/**
+ * Helper object for main version of Android 13.
+ */
+ @AddedIn(majorVersion = 33, minorVersion = 1)
+ @NonNull
+ public static final PlatformApiVersion TIRAMISU_0 =
+ forMajorAndMinorVersions(Build.VERSION_CODES.TIRAMISU, 0);
+
+ /**
+ * Helper object for first minor upgrade of Android 13.
+ */
+ @AddedIn(majorVersion = 33, minorVersion = 1)
+ @NonNull
+ public static final PlatformApiVersion TIRAMISU_1 =
+ forMajorAndMinorVersions(Build.VERSION_CODES.TIRAMISU, 1);
+
+ /**
* Creates a new instance with the given major and minor versions.
*/
@AddedIn(majorVersion = 33, minorVersion = 1)
diff --git a/car-test-lib/src/android/car/test/AbstractExpectableTestCase.java b/car-test-lib/src/android/car/test/AbstractExpectableTestCase.java
new file mode 100644
index 0000000..c2e5583
--- /dev/null
+++ b/car-test-lib/src/android/car/test/AbstractExpectableTestCase.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package android.car.test;
+
+import com.google.common.truth.BooleanSubject;
+import com.google.common.truth.Expect;
+import com.google.common.truth.StandardSubjectBuilder;
+
+import org.junit.Rule;
+
+// NOTE: it could be a more generic AbstractTruthTestCase that provide similar methods
+// for assertThat() / assertWithMessage(), but then we'd need to remove all static import imports
+// from classes that indirectly extend it.
+/**
+ * Base class to make it easier to use {@code Truth} {@link Expect} assertions.
+ */
+public abstract class AbstractExpectableTestCase {
+
+ @Rule
+ public final Expect mExpect = Expect.create();
+
+ protected final StandardSubjectBuilder expectWithMessage(String msg) {
+ return mExpect.withMessage(msg);
+ }
+
+ protected final StandardSubjectBuilder expectWithMessage(String format, Object...args) {
+ return mExpect.withMessage(format, args);
+ }
+
+ // NOTE: Expect has dozens of that() methods; the'll be added "on demand".
+
+ protected final BooleanSubject expectThat(Boolean actual) {
+ return mExpect.that(actual);
+ }
+}
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/mainline/CarMainlineFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/mainline/CarMainlineFragment.java
index 6c5bfea..353251a 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/mainline/CarMainlineFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/mainline/CarMainlineFragment.java
@@ -22,7 +22,6 @@
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
@@ -100,14 +99,9 @@
mCarMajorVersion.setText(String.valueOf(carApiVersion.getMajorVersion()));
mCarMinorVersion.setText(String.valueOf(carApiVersion.getMinorVersion()));
- boolean isCarApiTQpr = carApiVersion
- .isAtLeast(CarApiVersion.forMajorAndMinorVersions(VERSION_CODES.TIRAMISU, 1));
- // TODO(b/230004170): use >= VERSION_CODES.U when available
- boolean isAndroidUOrHigher = platformApiVersion
- .isAtLeast(PlatformApiVersion.forMajorVersion(VERSION_CODES.CUR_DEVELOPMENT));
- Log.v(TAG, "onStart(): isCarApiTQpr=" + isCarApiTQpr
- + ", isAndroidUOrHigher=" + isAndroidUOrHigher);
- if (isCarApiTQpr || isAndroidUOrHigher) {
+ boolean isCarApiTQpr = carApiVersion.isAtLeast(CarApiVersion.TIRAMISU_1);
+ Log.v(TAG, "onStart(): isCarApiTQpr=" + isCarApiTQpr);
+ if (isCarApiTQpr) {
mPlatformVersion.setText(platformApiVersion.toString());
mCarVersion.setText(carApiVersion.toString());
setTargetCarVersion(/* isMajor= */ true);
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarApiVersionTest.java b/tests/android_car_api_test/src/android/car/apitest/CarApiVersionTest.java
new file mode 100644
index 0000000..5dd781b
--- /dev/null
+++ b/tests/android_car_api_test/src/android/car/apitest/CarApiVersionTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.car.apitest;
+
+import static android.car.CarApiVersion.TIRAMISU_0;
+import static android.car.CarApiVersion.TIRAMISU_1;
+import static android.os.Build.VERSION_CODES.TIRAMISU;
+
+import android.car.test.AbstractExpectableTestCase;
+
+import org.junit.Test;
+
+public final class CarApiVersionTest extends AbstractExpectableTestCase {
+
+ @Test
+ public void testTiramisu_0() {
+ expectWithMessage("TIRAMISU_0").that(TIRAMISU_1).isNotNull();
+ expectWithMessage("TIRAMISU_0.major").that(TIRAMISU_0.getMajorVersion())
+ .isEqualTo(TIRAMISU);
+ expectWithMessage("TIRAMISU_0.minor").that(TIRAMISU_0.getMinorVersion())
+ .isEqualTo(0);
+ }
+
+ @Test
+ public void testTiramisu_1() {
+ expectWithMessage("TIRAMISU_1").that(TIRAMISU_1).isNotNull();
+ expectWithMessage("TIRAMISU_1.major").that(TIRAMISU_1.getMajorVersion())
+ .isEqualTo(TIRAMISU);
+ expectWithMessage("TIRAMISU_1.minor").that(TIRAMISU_1.getMinorVersion())
+ .isEqualTo(1);
+ }
+}
diff --git a/tests/android_car_api_test/src/android/car/apitest/PlatformApiVersionTest.java b/tests/android_car_api_test/src/android/car/apitest/PlatformApiVersionTest.java
new file mode 100644
index 0000000..8dba6a6
--- /dev/null
+++ b/tests/android_car_api_test/src/android/car/apitest/PlatformApiVersionTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.car.apitest;
+
+
+import static android.car.PlatformApiVersion.TIRAMISU_0;
+import static android.car.PlatformApiVersion.TIRAMISU_1;
+import static android.os.Build.VERSION_CODES.TIRAMISU;
+
+import android.car.test.AbstractExpectableTestCase;
+
+import org.junit.Test;
+
+public final class PlatformApiVersionTest extends AbstractExpectableTestCase {
+
+ @Test
+ public void testTiramisu() {
+ expectWithMessage("TIRAMISU_0").that(TIRAMISU_0).isNotNull();
+ expectWithMessage("TIRAMISU_0.major").that(TIRAMISU_0.getMajorVersion())
+ .isEqualTo(TIRAMISU);
+ expectWithMessage("TIRAMISU_0.minor").that(TIRAMISU_0.getMinorVersion())
+ .isEqualTo(0);
+ }
+
+ @Test
+ public void testTiramisu_1() {
+ expectWithMessage("TIRAMISU_1").that(TIRAMISU_1).isNotNull();
+ expectWithMessage("TIRAMISU_1.major").that(TIRAMISU_1.getMajorVersion())
+ .isEqualTo(TIRAMISU);
+ expectWithMessage("TIRAMISU_1.minor").that(TIRAMISU_1.getMinorVersion())
+ .isEqualTo(1);
+ }
+}
