commit 5c32ca386ab2035ccad860e11976e0aa8ff2e133
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 16 03:29:20 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jul 16 03:29:20 2022 +0000
tree 6281fa817bfa33bb873c68b53fdd5d2f008eaa6d
parent 6cb420f6219b3456677b23647c213eb6946ef780
parent c5ad522fef9c02c918387c44e2b86c227630eee0

Snap for 8837442 from c5ad522fef9c02c918387c44e2b86c227630eee0 to tm-qpr1-release

Change-Id: I26c1d7af797f7b3592b993b035dcca6f67e2d41b

fs_mgr/tests/vts_fs_test.cpp

diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp
index 3f12103..ae8e459 100644
--- a/fs_mgr/tests/vts_fs_test.cpp
+++ b/fs_mgr/tests/vts_fs_test.cpp
@@ -28,8 +28,8 @@
 }
 
 TEST(fs, ErofsSupported) {
-    // U and higher for this test.
-    if (GetVsrLevel() <= __ANDROID_API_T__) {
+    // T-launch GKI kernels and higher must support EROFS.
+    if (GetVsrLevel() < __ANDROID_API_T__) {
         GTEST_SKIP();
     }
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 870a97b..cd71aa8 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -823,6 +823,7 @@
     mkdir /data/misc/odsign 0710 root system
     # directory used for odsign metrics
     mkdir /data/misc/odsign/metrics 0770 root system
+
     # Directory for VirtualizationService temporary image files.
     # Delete any stale files owned by the old virtualizationservice uid (b/230056726).
     chmod 0770 /data/misc/virtualizationservice
@@ -1029,7 +1030,8 @@
     exec_start update_verifier_nonencrypted
     start statsd
     start netd
-    trigger zygote-run
+    start zygote
+    start zygote_secondary
 
 on zygote-start && property:ro.crypto.state=unsupported
     wait_for_prop odsign.verification.done 1
@@ -1037,7 +1039,8 @@
     exec_start update_verifier_nonencrypted
     start statsd
     start netd
-    trigger zygote-run
+    start zygote
+    start zygote_secondary
 
 on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type=file
     wait_for_prop odsign.verification.done 1
@@ -1045,15 +1048,6 @@
     exec_start update_verifier_nonencrypted
     start statsd
     start netd
-    trigger zygote-run
-
-on zygote-run && property:ro.zygote=zygote32
-    start zygote
-
-on zygote-run && property:ro.zygote=zygote64
-    start zygote
-
-on zygote-run && property:ro.zygote=zygote64_32
     start zygote
     start zygote_secondary
 

rootdir/init.zygote64_32.rc

diff --git a/rootdir/init.zygote64_32.rc b/rootdir/init.zygote64_32.rc
index dfe1645..efb30d6 100644
--- a/rootdir/init.zygote64_32.rc
+++ b/rootdir/init.zygote64_32.rc
@@ -25,4 +25,3 @@
     socket usap_pool_secondary stream 660 root system
     onrestart restart zygote
     task_profiles ProcessCapacityHigh MaxPerformance
-    disabled