ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am a6597598: Merge "fix adb {forward,reverse} --no-rebind"

Browse source 
* commit 'a6597598a0b82759960df09fd173192ca8c82f0c':
  fix adb {forward,reverse} --no-rebind
This commit is contained in:
Elliott Hughes 2015-07-30 00:51:26 +00:00 • committed by Android Git Automerger
commit e0541c7d7e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
adb/adb.cpp
View file

@ -770,12 +770,12 @@ int handle_forward_request(const char* service, TransportType type, const char*
if (android::base::StartsWith(service, "killforward:")) {
kill_forward = true;
service += 12;
} else {
service += 8; // skip past "forward:"
if (android::base::StartsWith(service, "norebind:")) {
no_rebind = true;
service += 9;
}
} else {
service += 8;
}
std::vector<std::string> pieces = android::base::Split(service, ";");
@ -824,7 +824,7 @@ int handle_forward_request(const char* service, TransportType type, const char*
message = android::base::StringPrintf("cannot bind to socket: %s", strerror(errno));
break;
case INSTALL_STATUS_CANNOT_REBIND:
message = android::base::StringPrintf("cannot rebind existing socket: %s", strerror(errno));
message = android::base::StringPrintf("cannot rebind existing socket");
break;
case INSTALL_STATUS_LISTENER_NOT_FOUND:
message = android::base::StringPrintf("listener '%s' not found", service);