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

Commit 8c836121 authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Auto enable usb adb if booting with debug ramdisk" am: 155bba8b am:... 

Merge "Auto enable usb adb if booting with debug ramdisk" am: 155bba8b am: 0d9240f8 am: df05b6d4

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



Change-Id: I8ab1c914b39fe51053a63c30d3ee87b05a48c82c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a0e21ee6 df05b6d4

init/property_service.cpp

+5 −0
Original line number Diff line number Diff line
@@ -1351,6 +1351,11 @@ static void HandleInitSocket() { 
                InitPropertySet(persistent_property_record.name(),

                                persistent_property_record.value());

            }

            // Apply debug ramdisk special settings after persistent properties are loaded.

            if (android::base::GetBoolProperty("ro.force.debuggable", false)) {

                // Always enable usb adb if device is booted with debug ramdisk.

                update_sys_usb_config();

            }

            InitPropertySet("ro.persistent_properties.ready", "true");

            persistent_properties_loaded = true;

            break;