commit 00bf9dcb01f649234c38803b1251e26d0c379092
author Pete Bentley <prb@google.com> Tue Jul 12 09:50:40 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 12 09:50:40 2022 +0000
tree 0975a6f046262cfb1483634ecdbaa4a627a559c4
parent eebd7f2b7d7e71ed9ada9dbd716b062bc9191ea9
parent c017e2ce0a4ec00c087b0397ed44450a17a4d379

Merge "Move boringssl self tests from early-init to init."

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 aac2cfd..3f12103 100644
--- a/fs_mgr/tests/vts_fs_test.cpp
+++ b/fs_mgr/tests/vts_fs_test.cpp
@@ -28,8 +28,8 @@
 }
 
 TEST(fs, ErofsSupported) {
-    // S and higher for this test.
-    if (GetVsrLevel() < __ANDROID_API_S__) {
+    // U and higher for this test.
+    if (GetVsrLevel() <= __ANDROID_API_T__) {
         GTEST_SKIP();
     }
 

init/subcontext.cpp

diff --git a/init/subcontext.cpp b/init/subcontext.cpp
index bb3967e..bd2bec5 100644
--- a/init/subcontext.cpp
+++ b/init/subcontext.cpp
@@ -381,6 +381,9 @@
 }
 
 void SubcontextTerminate() {
+    if (!subcontext) {
+        return;
+    }
     subcontext_terminated_by_shutdown = true;
     kill(subcontext->pid(), SIGTERM);
 }