From 64d303a0e750e5604564d6a91c11aea663f6874a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 18 Jul 2015 13:57:46 -0700 Subject: [PATCH] Fix adbd/adb server confusion in an error message. Change-Id: Iacb8bcfb1e8e1d46198ee4ba8cf0ec0d1b98c75a --- adb/transport.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/adb/transport.cpp b/adb/transport.cpp index 274449bea..1bb130f8e 100644 --- a/adb/transport.cpp +++ b/adb/transport.cpp @@ -789,9 +789,10 @@ retry: if (result->connection_state == kCsUnauthorized) { *error_out = "device unauthorized.\n"; char* ADB_VENDOR_KEYS = getenv("ADB_VENDOR_KEYS"); - *error_out += "This adbd's $ADB_VENDOR_KEYS is "; + *error_out += "This adb server's $ADB_VENDOR_KEYS is "; *error_out += ADB_VENDOR_KEYS ? ADB_VENDOR_KEYS : "not set"; - *error_out += "; try 'adb kill-server' if that seems wrong.\n"; + *error_out += "\n"; + *error_out += "Try 'adb kill-server' if that seems wrong.\n"; *error_out += "Otherwise check for a confirmation dialog on your device."; result = NULL; }