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

Commit 848cb392 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "init: delay 'user root' test to W+" into main am: 0d8a598b 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3095290



Change-Id: Idbe10b3e4a0229b87853fea4d065fe52231dbdd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 426edd89 0d8a598b

init/host_init_stubs.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#define __ANDROID_API_S__ 31

#define __ANDROID_API_T__ 33

#define __ANDROID_API_U__ 34

#define __ANDROID_API_V__ 35



// sys/system_properties.h

#define PROP_VALUE_MAX 92

init/init_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ service A something 


    ASSERT_TRUE(parser.ParseConfig(tf.path));



    if (GetIntProperty("ro.vendor.api_level", 0) > __ANDROID_API_U__) {

    if (GetIntProperty("ro.vendor.api_level", 0) > __ANDROID_API_V__) {

        ASSERT_EQ(1u, parser.parse_error_count());

    } else {

        ASSERT_EQ(0u, parser.parse_error_count());

init/service_parser.cpp

+3 −3
Original line number Diff line number Diff line
@@ -680,12 +680,12 @@ Result<void> ServiceParser::EndSection() { 
    }



    if (service_->proc_attr_.parsed_uid == std::nullopt) {

        if (android::base::GetIntProperty("ro.vendor.api_level", 0) > __ANDROID_API_U__) {

        if (android::base::GetIntProperty("ro.vendor.api_level", 0) > __ANDROID_API_V__) {

            return Error() << "No user specified for service '" << service_->name()

                           << "'. Defaults to root.";

                           << "', so it would have been root.";

        } else {

            LOG(WARNING) << "No user specified for service '" << service_->name()

                         << "'. Defaults to root.";

                         << "', so it is root.";

        }

    }