commit d55e9a90ae443076143c3558e777d174bb7a460c
author LuK1337 <priv.luk@gmail.com> Sun Apr 12 19:04:59 2020 +0200
committer Nick Reuter <nreuter85@gmail.com> Fri Dec 06 21:13:46 2024 -0600
tree 704a37198cc64e64a03f005f75aaccf5333f2202
parent 9891f22b76596f81fb98cf4b2ad29bffe9a866f6

recovery: Add "Enable ADB" to advanced options

Change-Id: I78ff93a43a17caeaae8a9601ec299b53a2802b20

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index a91629e..bb7add4 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -521,6 +521,14 @@
         choose_recovery_file(device);
         break;
 
+      case Device::ENABLE_ADB:
+        android::base::SetProperty("ro.adb.secure.recovery", "0");
+        android::base::SetProperty("ctl.restart", "adbd");
+        device->RemoveMenuItemForAction(Device::ENABLE_ADB);
+        device->GoHome();
+        ui->Print("Enabled ADB.\n");
+        break;
+
       case Device::RUN_GRAPHICS_TEST:
         run_graphics_test(ui);
         break;

recovery_main.cpp

diff --git a/recovery_main.cpp b/recovery_main.cpp
index 4560c0c..9d931e5 100644
--- a/recovery_main.cpp
+++ b/recovery_main.cpp
@@ -485,6 +485,10 @@
     device->RemoveMenuItemForAction(Device::ENTER_RESCUE);
   }
 
+  if (get_build_type() != "userdebug") {
+    device->RemoveMenuItemForAction(Device::ENABLE_ADB);
+  }
+
   if (get_build_type() == "user") {
     device->RemoveMenuItemForAction(Device::WIPE_SYSTEM);
     device->RemoveMenuItemForAction(Device::MOUNT_SYSTEM);

recovery_ui/device.cpp

diff --git a/recovery_ui/device.cpp b/recovery_ui/device.cpp
index 97d5872..38a2551 100644
--- a/recovery_ui/device.cpp
+++ b/recovery_ui/device.cpp
@@ -44,6 +44,7 @@
   { "Reboot to recovery", Device::REBOOT_RECOVERY },
   { "Mount /system", Device::MOUNT_SYSTEM },
   { "View recovery logs", Device::VIEW_RECOVERY_LOGS },
+  { "Enable ADB", Device::ENABLE_ADB },
   { "Run graphics test", Device::RUN_GRAPHICS_TEST },
   { "Run locale test", Device::RUN_LOCALE_TEST },
   { "Enter rescue", Device::ENTER_RESCUE },

recovery_ui/include/recovery_ui/device.h

diff --git a/recovery_ui/include/recovery_ui/device.h b/recovery_ui/include/recovery_ui/device.h
index f7ef784..d95d6fd 100644
--- a/recovery_ui/include/recovery_ui/device.h
+++ b/recovery_ui/include/recovery_ui/device.h
@@ -70,6 +70,7 @@
     REBOOT_FROM_FASTBOOT = 20,
     SHUTDOWN_FROM_FASTBOOT = 21,
     WIPE_SYSTEM = 100,
+    ENABLE_ADB = 101,
     MENU_BASE = 200,
     MENU_UPDATE = 201,
     MENU_WIPE = 202,