Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c32ca38 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8837442 from c5ad522f to tm-qpr1-release 

Change-Id: I26c1d7af797f7b3592b993b035dcca6f67e2d41b
parents 6cb420f6 c5ad522f

fs_mgr/tests/vts_fs_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ static int GetVsrLevel() { 
}



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

+5 −11
Original line number Diff line number Diff line
@@ -823,6 +823,7 @@ on post-fs-data 
    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 @@ on zygote-start && property:ro.crypto.state=unencrypted 
    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 @@ on zygote-start && property:ro.crypto.state=unsupported 
    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 @@ on zygote-start && property:ro.crypto.state=encrypted && property:ro.crypto.type 
    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

+0 −1
Original line number Diff line number Diff line
@@ -25,4 +25,3 @@ service zygote_secondary /system/bin/app_process32 -Xzygote /system/bin --zygote 
    socket usap_pool_secondary stream 660 root system

    onrestart restart zygote

    task_profiles ProcessCapacityHigh MaxPerformance
 
    disabled