Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_packages_modules_adb / d3067475cbe7dedb38030e743dbf30e29f8a2a8f
commitd3067475cbe7dedb38030e743dbf30e29f8a2a8f[log] [tgz]
authorJosh Gao <jmgao@google.com>Tue Aug 07 14:14:21 2018 -0700
committerJosh Gao <jmgao@google.com>Tue Aug 07 14:24:36 2018 -0700
tree43c67d9b2a29ec5b0d8c37857c440d396442f042
parent917fbb4a8b9c1a14797c771bf795a216855e61a3 [diff]
adb: clean up handle_host_request.

Previously, we were returning the result of SendOkay/SendFail in a few
places after handling a host request, which is incorrect for two
reasons. First, the return type of SendOkay/SendFail is bool, and
handle_host_request was expected to return 0 on success. Second, we
don't care if the SendOkay fails; if we got to that point, we're done
with the request, regardless of whether we succeeded to report our
result. The result of this was a spurious failure result reported after
the initial result, which was ignored by the adb client.

Test: manually straced adb server
Test: python test_adb.py
Test: python test_device.py
Change-Id: I7d45ba527e1faccbbae5b15e7a0d1557b0a84858
3 files changed
tree: 43c67d9b2a29ec5b0d8c37857c440d396442f042
  1. client/
  2. daemon/
  3. sysdeps/
  4. .clang-format ⇨ ../.clang-format-4
  5. adb.bash
  6. adb.cpp
  7. adb.h
  8. adb_auth.h
  9. adb_io.cpp
  10. adb_io.h
  11. adb_io_test.cpp
  12. adb_listeners.cpp
  13. adb_listeners.h
  14. adb_listeners_test.cpp
  15. adb_mdns.h
  16. adb_trace.cpp
  17. adb_trace.h
  18. adb_unique_fd.cpp
  19. adb_unique_fd.h
  20. adb_utils.cpp
  21. adb_utils.h
  22. adb_utils_test.cpp
  23. Android.bp
  24. Android.mk
  25. benchmark_device.py
  26. bugreport_test.cpp
  27. fdevent.cpp
  28. fdevent.h
  29. fdevent_test.cpp
  30. fdevent_test.h
  31. file_sync_protocol.h
  32. MODULE_LICENSE_APACHE2
  33. NOTICE
  34. OVERVIEW.TXT
  35. OWNERS
  36. protocol.txt
  37. security_log_tags.h
  38. services.cpp
  39. services.h
  40. SERVICES.TXT
  41. shell_protocol.h
  42. shell_service_protocol.cpp
  43. shell_service_protocol_test.cpp
  44. socket.h
  45. socket_spec.cpp
  46. socket_spec.h
  47. socket_spec_test.cpp
  48. socket_test.cpp
  49. sockets.cpp
  50. sockets.dia
  51. SYNC.TXT
  52. sysdeps.h
  53. sysdeps_test.cpp
  54. sysdeps_unix.cpp
  55. sysdeps_win32.cpp
  56. sysdeps_win32_test.cpp
  57. test_adb.py
  58. test_device.py
  59. trace.sh
  60. transport.cpp
  61. transport.h
  62. transport_benchmark.cpp
  63. transport_fd.cpp
  64. transport_local.cpp
  65. transport_test.cpp
  66. transport_usb.cpp
  67. types.h
  68. types_test.cpp
  69. usb.h