aboutsummaryrefslogtreecommitdiffstats
path: root/adb_install.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-10 14:46:14 -0800
committerElliott Hughes <enh@google.com>2015-02-10 14:46:14 -0800
commitf14af80a1418acdc0ae6fea3da0285a357d57182 (patch)
tree5fc39fefa4022fa75857792dd517a9a14f60256c /adb_install.cpp
parent99e084ca8012bc7af52ae2fb9e72ab7180177daf (diff)
downloadbootable_recovery-f14af80a1418acdc0ae6fea3da0285a357d57182.tar.gz
bootable_recovery-f14af80a1418acdc0ae6fea3da0285a357d57182.tar.bz2
bootable_recovery-f14af80a1418acdc0ae6fea3da0285a357d57182.zip
recovery: Properly detect userdebug or eng builds
The recovery system behaves a little bit differently on userdebug or eng builds by presenting error reports to the user in the ui. This is controlled by checking the build fingerprint for the string :userdebug/ or :eng/. But with AOSP version numbers most AOSP builds blows the 92 char limit of ro.build.fingerprint and therefore the property is not set, so this condition will always be evaluated to false, for most builds. Instead of depending on the flaky ro.build.fingerprint this change uses ro.debuggable. Change-Id: I74bc00c655ac596aaf4b488ecea58f0a8de9c26b
Diffstat (limited to 'adb_install.cpp')
-rw-r--r--adb_install.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/adb_install.cpp b/adb_install.cpp
index be3b9a0..e328960 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -61,9 +61,7 @@ stop_adbd() {
static void
maybe_restart_adbd() {
- char value[PROPERTY_VALUE_MAX+1];
- int len = property_get("ro.debuggable", value, NULL);
- if (len == 1 && value[0] == '1') {
+ if (is_ro_debuggable()) {
ui->Print("Restarting adbd...\n");
set_usb_driver(true);
property_set("ctl.start", "adbd");