Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R"
This commit is contained in:
commit
c8e4154d89
1 changed files with 7 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue