tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 953b44c3: Merge "Fix adbd/adb server confusion in an error message."

Browse source 
* commit '953b44c3ed7b543f5e0c3799f1d37114028be3d2':
  Fix adbd/adb server confusion in an error message.
This commit is contained in:
Elliott Hughes 2015-07-20 17:42:52 +00:00 committed by Android Git Automerger
commit 9287d2d83a
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;
}