diff options
| author | Elliott Hughes <enh@google.com> | 2016-09-26 21:42:16 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-26 21:42:16 +0200 |
| commit | d5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5 (patch) | |
| tree | 4f7aa2ba4ccf0fc29fb709346392e0b9aa33442d /adb_install.cpp | |
| parent | Merge "Check corruption when reading uncrypt_status file" am: 3cf815a6a9 (diff) | |
| parent | Merge "Switch to <android-base/properties.h>." (diff) | |
| download | android_bootable_recovery-d5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5.tar android_bootable_recovery-d5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5.tar.gz android_bootable_recovery-d5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5.tar.bz2 android_bootable_recovery-d5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5.tar.lz android_bootable_recovery-d5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5.tar.xz android_bootable_recovery-d5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5.tar.zst android_bootable_recovery-d5c7d6bffe9d03c79c2504f7cbb5091ac377a6c5.zip | |
Diffstat (limited to 'adb_install.cpp')
| -rw-r--r-- | adb_install.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/adb_install.cpp b/adb_install.cpp index b05fda13a..fab72f8a4 100644 --- a/adb_install.cpp +++ b/adb_install.cpp @@ -26,13 +26,14 @@ #include <fcntl.h> #include "ui.h" -#include "cutils/properties.h" #include "install.h" #include "common.h" #include "adb_install.h" #include "minadbd/fuse_adb_provider.h" #include "fuse_sideload.h" +#include <android-base/properties.h> + static void set_usb_driver(RecoveryUI* ui, bool enabled) { int fd = open("/sys/class/android_usb/android0/enable", O_WRONLY); if (fd < 0) { @@ -49,7 +50,7 @@ static void set_usb_driver(RecoveryUI* ui, bool enabled) { static void stop_adbd(RecoveryUI* ui) { ui->Print("Stopping adbd...\n"); - property_set("ctl.stop", "adbd"); + android::base::SetProperty("ctl.stop", "adbd"); set_usb_driver(ui, false); } @@ -57,7 +58,7 @@ static void maybe_restart_adbd(RecoveryUI* ui) { if (is_ro_debuggable()) { ui->Print("Restarting adbd...\n"); set_usb_driver(ui, true); - property_set("ctl.start", "adbd"); + android::base::SetProperty("ctl.start", "adbd"); } } |