Merge "Define SdkExtension version 1" into sc-dev am: 81d6c4f82c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/14787620
Change-Id: Id12b8ee599f89bca45c680249030f93e58f9d33f
diff --git a/derive_sdk/derive_sdk_test.cpp b/derive_sdk/derive_sdk_test.cpp
index 70d7dff..580544e 100644
--- a/derive_sdk/derive_sdk_test.cpp
+++ b/derive_sdk/derive_sdk_test.cpp
@@ -88,8 +88,8 @@
};
TEST_F(DeriveSdkTest, CurrentSystemImageValue) {
- EXPECT_R(0);
- EXPECT_S(0);
+ EXPECT_R(1);
+ EXPECT_S(1);
}
TEST_F(DeriveSdkTest, OneDessert_OneVersion_OneApex) {
diff --git a/gen_sdk/extensions_db.textpb b/gen_sdk/extensions_db.textpb
index e69de29..5d54a58 100644
--- a/gen_sdk/extensions_db.textpb
+++ b/gen_sdk/extensions_db.textpb
@@ -0,0 +1,63 @@
+versions {
+ version: 1
+ requirements {
+ module: ART
+ version {
+ version: 1
+ }
+ }
+ requirements {
+ module: CONSCRYPT
+ version {
+ version: 1
+ }
+ }
+ requirements {
+ module: IPSEC
+ version {
+ version: 1
+ }
+ }
+ requirements {
+ module: MEDIA
+ version {
+ version: 1
+ }
+ }
+ requirements {
+ module: MEDIA_PROVIDER
+ version {
+ version: 1
+ }
+ }
+ requirements {
+ module: PERMISSIONS
+ version {
+ version: 1
+ }
+ }
+ requirements {
+ module: SCHEDULING
+ version {
+ version: 1
+ }
+ }
+ requirements {
+ module: SDK_EXTENSIONS
+ version {
+ version: 1
+ }
+ }
+ requirements {
+ module: STATSD
+ version {
+ version: 1
+ }
+ }
+ requirements {
+ module: TETHERING
+ version {
+ version: 1
+ }
+ }
+}
diff --git a/tests/cts/Extensions/src/android/os/ext/cts/SdkExtensionsTest.java b/tests/cts/Extensions/src/android/os/ext/cts/SdkExtensionsTest.java
index ea310c7..c2c5b9b 100644
--- a/tests/cts/Extensions/src/android/os/ext/cts/SdkExtensionsTest.java
+++ b/tests/cts/Extensions/src/android/os/ext/cts/SdkExtensionsTest.java
@@ -38,7 +38,8 @@
/** Verifies that getExtensionVersion only return existing versions */
public void testValidValues() throws Exception {
- for (int sdk = Build.VERSION_CODES.R; sdk <= 1_000_000; sdk++) {
+ int firstUnassigned = Build.VERSION_CODES.S + 1;
+ for (int sdk = firstUnassigned; sdk <= 1_000_000; sdk++) {
// No extension SDKs versions yet.
assertEquals(0, SdkExtensions.getExtensionVersion(sdk));
}
@@ -46,8 +47,8 @@
/** Verifies that the public sysprops are set as expected */
public void testSystemProperties() throws Exception {
- assertEquals("0", SystemProperties.get("build.version.extensions.r"));
- String expectedS = SdkLevel.isAtLeastS() ? "0" : "";
+ assertEquals("1", SystemProperties.get("build.version.extensions.r"));
+ String expectedS = SdkLevel.isAtLeastS() ? "1" : "";
assertEquals(expectedS, SystemProperties.get("build.version.extensions.s"));
}
@@ -57,7 +58,8 @@
if (SdkLevel.isAtLeastS()) {
expectedSize++;
}
- assertEquals(0, (int) versions.get(Build.VERSION_CODES.R));
+ assertEquals(1, (int) versions.get(Build.VERSION_CODES.R));
+ assertEquals(1, (int) versions.get(Build.VERSION_CODES.S));
assertEquals(expectedSize, versions.size());
}
diff --git a/tests/e2e/Extensions/test-src/com/android/tests/apex/sdkextensions/SdkExtensionsHostTest.java b/tests/e2e/Extensions/test-src/com/android/tests/apex/sdkextensions/SdkExtensionsHostTest.java
index e3f83c7..5a4839a 100644
--- a/tests/e2e/Extensions/test-src/com/android/tests/apex/sdkextensions/SdkExtensionsHostTest.java
+++ b/tests/e2e/Extensions/test-src/com/android/tests/apex/sdkextensions/SdkExtensionsHostTest.java
@@ -174,8 +174,8 @@
}
private void assertVersionDefault() throws Exception {
- assertRVersionEquals(0);
- assertSVersionEquals(0);
+ assertRVersionEquals(1);
+ assertSVersionEquals(1);
assertTrue(broadcastForBoolean("MAKE_CALLS_DEFAULT", null));
}