From 8fb7f773f04dc43dd4aff8d05b23ec06023c37b0 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 16 Oct 2019 14:22:12 -0700 Subject: init: hack for /charger symlink Legacy symlink from /charger to /system/bin/charger is removed. Instead, all Android R devices are required to use /system/bin/charger instead. See hardware/interfaces/health/2.1/README.md for details. Bug: 142286265 Test: charger mode Change-Id: Ib478a864ef68647bc9fc14650ca3d382952b80c8 --- init/service_parser.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'init/service_parser.cpp') diff --git a/init/service_parser.cpp b/init/service_parser.cpp index e7808a999..e6a341d77 100644 --- a/init/service_parser.cpp +++ b/init/service_parser.cpp @@ -560,6 +560,11 @@ Result ServiceParser::ParseSection(std::vector&& args, str_args[0] = "/system/bin/watchdogd"; } } + if (SelinuxGetVendorAndroidVersion() <= __ANDROID_API_Q__) { + if (str_args[0] == "/charger") { + str_args[0] = "/system/bin/charger"; + } + } service_ = std::make_unique(name, restart_action_subcontext, str_args); return {}; -- cgit v1.2.3