commit 155bba8b0cf5371ff7b11f77fcb67b82afb6c031
author Yi-yo Chiang <yochiang@google.com> Fri Jun 10 12:08:34 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 10 12:08:34 2022 +0000
tree cd42e6a99e4e19043bc554e94adcf50b725ad14d
parent 2ba3ae310ecd67ea78717cbcf6cd9e80548a78e7
parent 70c53f5d52fff73eff48c324883a5d670b78aa23

Merge "Auto enable usb adb if booting with debug ramdisk"

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index a1f6e04..7e92538 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -1351,6 +1351,11 @@
                 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;