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

Commit 9c590e4c authored by Tom Cherry's avatar Tom Cherry Committed by Automerger Merge Worker
Browse files

Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" am: c8e4154d

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

Change-Id: Id1ce1ce19e9df18c77fee7bd5e0f01ece54218fe
parents dad59e19 c8e4154d
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
#include <functional>

#include <android-base/file.h>
#include <android-base/properties.h>
#include <gtest/gtest.h>

#include "action.h"
@@ -32,6 +33,8 @@
#include "service_parser.h"
#include "util.h"

using android::base::GetIntProperty;

namespace android {
namespace init {

@@ -240,6 +243,10 @@ TEST(init, EventTriggerOrderMultipleFiles) {
}

TEST(init, RejectsCriticalAndOneshotService) {
    if (GetIntProperty("ro.product.first_api_level", 10000) < 30) {
        GTEST_SKIP() << "Test only valid for devices launching with R or later";
    }

    std::string init_script =
            R"init(
service A something