summaryrefslogtreecommitdiffstats
path: root/adb_install.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2016-09-26 21:52:42 +0200
committerElliott Hughes <enh@google.com>2016-09-26 21:53:52 +0200
commit130f6c86f590b61bc3aef7883500eb4c0ba593c3 (patch)
tree2577e80d8cac345ac5aec61d6af6d0e2d7c0c862 /adb_install.cpp
parentFail gracefully when we fail to fork the update binary (diff)
parentMerge "Switch to <android-base/properties.h>." am: cc02f9652f (diff)
downloadandroid_bootable_recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.tar
android_bootable_recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.tar.gz
android_bootable_recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.tar.bz2
android_bootable_recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.tar.lz
android_bootable_recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.tar.xz
android_bootable_recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.tar.zst
android_bootable_recovery-130f6c86f590b61bc3aef7883500eb4c0ba593c3.zip
Diffstat (limited to 'adb_install.cpp')
-rw-r--r--adb_install.cpp7
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");
}
}