openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "init: prevent persist.sys.usb.config initalized as none,adb" into rvc-dev

This commit is contained in:
TreeHugger Robot 2020-02-27 00:53:15 +00:00 committed by Android (Google) Code Review
parent 7e5f2aa478 446c4fbed0
commit f3dfd4d821
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init/property_service.cpp
View File

@ -745,7 +745,9 @@ static bool load_properties_from_file(const char* filename, const char* filter,
static void update_sys_usb_config() {
bool is_debuggable = android::base::GetBoolProperty("ro.debuggable", false);
std::string config = android::base::GetProperty("persist.sys.usb.config", "");
if (config.empty()) {
// b/150130503, add (config == "none") condition here to prevent appending
// ",adb" if "none" is explicitly defined in default prop.
if (config.empty() || config == "none") {
InitPropertySet("persist.sys.usb.config", is_debuggable ? "adb" : "none");
} else if (is_debuggable && config.find("adb") == std::string::npos &&
config.length() + 4 < PROP_VALUE_MAX) {