ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" am: c8e4154d89 am: 9c590e4c97

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

Change-Id: I8d77c402b55b1e460dd49c4a37fd00baada98d5d
This commit is contained in:
Tom Cherry 2020-07-09 20:06:57 +00:00 • committed by Automerger Merge Worker
commit f18e009f97
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
init/init_test.cpp
View file

@ -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