Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android_packages_modules_adb / 22fc5e99f10567cfe2c64a4426dc2c06c968b615
commit22fc5e99f10567cfe2c64a4426dc2c06c968b615[log] [tgz]
authorDavid Pursell <dpursell@google.com>Wed Sep 30 13:35:42 2015 -0700
committerDavid Pursell <dpursell@google.com>Wed Sep 30 15:40:09 2015 -0700
tree5671a74ce54040916cb3e51eaa9d0a717aa9b819
parent5f32b962de5830768db9fafeb561960bf60440b9 [diff]
adb: put legacy shell: service back in.

ddmlib does not use the ADB client, but instead connects directly to
the adb server. This breaks some of the assumptions I previously made
when enabling the shell protocol.

To fix this, the adb server now defaults to no protocol for the
standalone command, and the shell protocol must be explicitly requested
by the client. For example:
  shell:echo foo     -- no shell protocol
  shell,v2:echo foo  -- shell protocol

As long as I was touching the shell service arguments I also changed
them to no longer duplicate the command-line arguments. This allows
more flexibility to change the adb client CLI if necessary and makes
the code more readable.

Bug: http://b/24148636
Change-Id: I28d5ae578cf18cbe79347dc89cea1750ff4571a8
6 files changed
tree: 5671a74ce54040916cb3e51eaa9d0a717aa9b819
  1. client/
  2. daemon/
  3. .clang-format
  4. adb.cpp
  5. adb.h
  6. adb_auth.cpp
  7. adb_auth.h
  8. adb_auth_client.cpp
  9. adb_auth_host.cpp
  10. adb_client.cpp
  11. adb_client.h
  12. adb_io.cpp
  13. adb_io.h
  14. adb_io_test.cpp
  15. adb_listeners.cpp
  16. adb_listeners.h
  17. adb_trace.cpp
  18. adb_trace.h
  19. adb_utils.cpp
  20. adb_utils.h
  21. adb_utils_test.cpp
  22. Android.mk
  23. commandline.cpp
  24. console.cpp
  25. CPPLINT.cfg
  26. fdevent.cpp
  27. fdevent.h
  28. fdevent_test.cpp
  29. file_sync_client.cpp
  30. file_sync_service.cpp
  31. file_sync_service.h
  32. framebuffer_service.cpp
  33. get_my_path_darwin.cpp
  34. get_my_path_linux.cpp
  35. jdwp_service.cpp
  36. MODULE_LICENSE_APACHE2
  37. mutex_list.h
  38. NOTICE
  39. OVERVIEW.TXT
  40. protocol.txt
  41. remount_service.cpp
  42. remount_service.h
  43. services.cpp
  44. services.h
  45. SERVICES.TXT
  46. set_verity_enable_state_service.cpp
  47. shell_service.cpp
  48. shell_service.h
  49. shell_service_protocol.cpp
  50. shell_service_protocol_test.cpp
  51. shell_service_test.cpp
  52. socket.h
  53. socket_test.cpp
  54. sockets.cpp
  55. sockets.dia
  56. SYNC.TXT
  57. sysdeps.h
  58. sysdeps_win32.cpp
  59. sysdeps_win32_test.cpp
  60. test_adb.py
  61. test_track_devices.cpp
  62. transport.cpp
  63. transport.h
  64. transport_local.cpp
  65. transport_test.cpp
  66. transport_usb.cpp
  67. usb_linux.cpp
  68. usb_linux_client.cpp
  69. usb_osx.cpp
  70. usb_windows.cpp