openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix adbd/adb server confusion in an error message. 

Change-Id: Iacb8bcfb1e8e1d46198ee4ba8cf0ec0d1b98c75a
This commit is contained in:
Elliott Hughes 2015-07-18 13:57:46 -07:00
parent ff2016599d
commit 64d303a0e7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
adb/transport.cpp
View File

@ -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;
}