Merge "Merge Android 12"HEADmaster

9 files changed, 84 insertions, 14 deletions

diff --git a/derive_sdk/derive_sdk.cpp b/derive_sdk/derive_sdk.cpp
index 29cfca5..0b503de 100644
--- a/derive_sdk/derive_sdk.cpp
+++ b/derive_sdk/derive_sdk.cpp
@@ -41,6 +41,7 @@ static const std::unordered_map<std::string, SdkModule> kApexNameToModule = {
     {"com.android.media", SdkModule::MEDIA},
     {"com.android.mediaprovider", SdkModule::MEDIA_PROVIDER},
     {"com.android.permission", SdkModule::PERMISSIONS},
+    {"com.android.scheduling", SdkModule::SCHEDULING},
     {"com.android.sdkext", SdkModule::SDK_EXTENSIONS},
     {"com.android.os.statsd", SdkModule::STATSD},
     {"com.android.tethering", SdkModule::TETHERING},
@@ -51,7 +52,7 @@ static const std::unordered_set<SdkModule> kRModules = {
     SdkModule::PERMISSIONS, SdkModule::SDK_EXTENSIONS, SdkModule::STATSD, SdkModule::TETHERING,
 };
 
-static const std::unordered_set<SdkModule> kSModules = {SdkModule::ART};
+static const std::unordered_set<SdkModule> kSModules = {SdkModule::ART, SdkModule::SCHEDULING};
 
 bool ReadDatabase(const std::string& db_path, ExtensionDatabase& db) {
   std::string contents;
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 @@ class DeriveSdkTest : public ::testing::Test {
 };
 
 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/framework/java/android/os/ext/SdkExtensions.java b/framework/java/android/os/ext/SdkExtensions.java
index 3d9a4b0..ac1929e 100644
--- a/framework/java/android/os/ext/SdkExtensions.java
+++ b/framework/java/android/os/ext/SdkExtensions.java
@@ -43,7 +43,7 @@ import java.util.Map;
 public class SdkExtensions {
 
     // S_VERSION_CODE is a separate field to simplify management across branches.
-    private static final int VERSION_CODE_S = VERSION_CODES.CUR_DEVELOPMENT;
+    private static final int VERSION_CODE_S = VERSION_CODES.S;
     private static final int R_EXTENSION_INT;
     private static final int S_EXTENSION_INT;
     private static final Map<Integer, Integer> ALL_EXTENSION_INTS;
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/Classpaths/src/android/os/ext/classpath/cts/ClasspathsTest.java b/tests/cts/Classpaths/src/android/os/ext/classpath/cts/ClasspathsTest.java
index 11d901f..93e7b2e 100644
--- a/tests/cts/Classpaths/src/android/os/ext/classpath/cts/ClasspathsTest.java
+++ b/tests/cts/Classpaths/src/android/os/ext/classpath/cts/ClasspathsTest.java
@@ -89,7 +89,6 @@ public class ClasspathsTest extends BaseHostJUnit4Test {
                 "/apex/com.android.art/",
                 "/system/",
                 "/system_ext/",
-                "/apex/com.android.i18n/",
                 "/apex/");
         assertThat(jars)
                 .prefixesMatch(expectedPrefixes)
@@ -116,7 +115,7 @@ public class ClasspathsTest extends BaseHostJUnit4Test {
         assertThat(bootJars).containsAtLeastElementsIn(jars);
 
         ImmutableList<String> expectedPrefixes = ImmutableList.of(
-                "/apex/com.android.art/", "/system/", "/system_ext/", "/apex/com.android.i18n/");
+                "/apex/com.android.art/", "/system/", "/system_ext/");
         assertThat(jars)
                 .prefixesMatch(expectedPrefixes)
                 .inOrder();
@@ -201,6 +200,10 @@ public class ClasspathsTest extends BaseHostJUnit4Test {
             boolean ordered = true;
             int currentPrefixIndex = expected.isEmpty() ? -1 : 0;
             for (String jar : actual) {
+                if (ICU4J_JAR.equals(jar)) {
+                    // TODO(b/191127295): ICU4j appears out of order, ignore it until fixed
+                    continue;
+                }
                 int prefixIndex = findFirstMatchingPrefix(jar, expected);
                 if (prefixIndex == -1) {
                     unexpectedJars.add(jar);
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..c3a42e8 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 @@ public class SdkExtensionsTest extends TestCase {
 
     /** 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,18 +47,20 @@ public class SdkExtensionsTest extends TestCase {
 
     /** 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"));
     }
 
     public void testExtensionVersions() throws Exception {
         Map<Integer, Integer> versions = SdkExtensions.getAllExtensionVersions();
         int expectedSize = 1;
+        assertEquals(1, (int) versions.get(Build.VERSION_CODES.R));
+
         if (SdkLevel.isAtLeastS()) {
+            assertEquals(1, (int) versions.get(Build.VERSION_CODES.S));
             expectedSize++;
         }
-        assertEquals(0, (int) versions.get(Build.VERSION_CODES.R));
         assertEquals(expectedSize, versions.size());
     }
 
diff --git a/tests/e2e/Extensions/apps-with-reqs/AndroidManifest-s12.xml b/tests/e2e/Extensions/apps-with-reqs/AndroidManifest-s12.xml
index fc5995c..6331c66 100644
--- a/tests/e2e/Extensions/apps-with-reqs/AndroidManifest-s12.xml
+++ b/tests/e2e/Extensions/apps-with-reqs/AndroidManifest-s12.xml
@@ -18,7 +18,7 @@
 
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29">
         <extension-sdk android:sdkVersion="30" android:minExtensionVersion="12" />
-        <extension-sdk android:sdkVersion="10000" android:minExtensionVersion="12" />
+        <extension-sdk android:sdkVersion="31" android:minExtensionVersion="12" />
     </uses-sdk>
 
     <application android:hasCode="false"></application>
diff --git a/tests/e2e/Extensions/apps-with-reqs/AndroidManifest-s45.xml b/tests/e2e/Extensions/apps-with-reqs/AndroidManifest-s45.xml
index 478553c..e05772e 100644
--- a/tests/e2e/Extensions/apps-with-reqs/AndroidManifest-s45.xml
+++ b/tests/e2e/Extensions/apps-with-reqs/AndroidManifest-s45.xml
@@ -18,7 +18,7 @@
 
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="29">
         <extension-sdk android:sdkVersion="30" android:minExtensionVersion="45" />
-        <extension-sdk android:sdkVersion="10000" android:minExtensionVersion="45" />
+        <extension-sdk android:sdkVersion="31" android:minExtensionVersion="45" />
     </uses-sdk>
 
     <application android:hasCode="false"></application>
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 @@ public class SdkExtensionsHostTest extends BaseHostJUnit4Test {
     }
 
     private void assertVersionDefault() throws Exception {
-        assertRVersionEquals(0);
-        assertSVersionEquals(0);
+        assertRVersionEquals(1);
+        assertSVersionEquals(1);
         assertTrue(broadcastForBoolean("MAKE_CALLS_DEFAULT", null));
     }