PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Start adbd in user mode if bootloader is unlocked" am: b65dd9cb0c

Browse Source 
am: e5288e6b69

Change-Id: I02c35302868aacdbc5ff513034f42e475a0805c7
This commit is contained in:
Tianjie Xu
2019-11-05 14:07:27 -08:00
committed by android-build-merger
parent 50a5d5da7e e5288e6b69
commit 845bf488cb
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etc/init.rc
View File

@@ -99,6 +99,10 @@ on property:service.adb.root=1
on fs && property:ro.debuggable=1 on fs && property:ro.debuggable=1
setprop sys.usb.config adb setprop sys.usb.config adb
# Also start adbd on user build with an unlocked bootloader
on fs && property:ro.debuggable=0 && androidboot.verifiedbootstate=orange
setprop sys.usb.config adb
on fs && property:sys.usb.configfs=1 on fs && property:sys.usb.configfs=1
mount configfs none /config mount configfs none /config
mkdir /config/usb_gadget/g1 0770 shell shell mkdir /config/usb_gadget/g1 0770 shell shell

8
recovery_main.cpp
View File

@@ -69,6 +69,10 @@ static bool IsRoDebuggable() {
return android::base::GetBoolProperty("ro.debuggable", false); return android::base::GetBoolProperty("ro.debuggable", false);
} }
static bool IsDeviceUnlocked() {
return "orange" == android::base::GetProperty("ro.boot.verifiedbootstate", "");
}
static void UiLogger(android::base::LogId /* id */, android::base::LogSeverity severity, static void UiLogger(android::base::LogId /* id */, android::base::LogSeverity severity,
const char* /* tag */, const char* /* file */, unsigned int /* line */, const char* /* tag */, const char* /* file */, unsigned int /* line */,
const char* message) { const char* message) {
@@ -463,7 +467,9 @@ int main(int argc, char** argv) {
listener_thread.detach(); listener_thread.detach();
while (true) { while (true) {
std::string usb_config = fastboot ? "fastboot" : IsRoDebuggable() ? "adb" : "none"; // We start adbd in recovery for the device with userdebug build or a unlocked bootloader.
std::string usb_config =
fastboot ? "fastboot" : IsRoDebuggable() || IsDeviceUnlocked() ? "adb" : "none";
std::string usb_state = android::base::GetProperty("sys.usb.state", "none"); std::string usb_state = android::base::GetProperty("sys.usb.state", "none");
if (usb_config != usb_state) { if (usb_config != usb_state) {
if (!SetUsbConfig("none")) { if (!SetUsbConfig("none")) {