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

Commit 807edd3e authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "init: prevent persist.sys.usb.config initalized as none,adb" am: 78464a03 

Change-Id: Ib903adce0ac6ed502c595dac670b5c7ec1d84963
parents eacb8dd0 78464a03

init/property_service.cpp

+3 −1
Original line number Diff line number Diff line
@@ -813,7 +813,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) {