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

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

Change-Id: Ia48b9e86f53cbc5e6f86c6979ae73baa79b09967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi-yo Chiang 2022-06-10 12:38:54 +00:00 committed by Automerger Merge Worker
commit 0d9240f898

View file

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