Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / modules / adb / 9548e56e58e754b9e4e78c8707fab5c08fa71034
commit9548e56e58e754b9e4e78c8707fab5c08fa71034[log] [tgz]
authorElliott Hughes <enh@google.com>Tue May 02 14:31:59 2017 -0700
committerElliott Hughes <enh@google.com>Tue May 02 14:41:04 2017 -0700
tree950df5cdfe743f1762bd6ae5ac10e8ae7d8b90f3
parent272e7a68f85706a631b209998ba5c4aeb69ca403 [diff]
Improve "adb sideload" error reporting.

Rather than quietly fall through to the legacy code with no explanation,
say why the first connection failed, and that the second attempt is only
going to be relevant for folks trying to sideload to a pre-KitKit device.

Before:

  $ adb sideload mysid-ota-424425.zip
  opening 'mysid-ota-424425.zip'...
  connecting...
  falling back to older sideload method...
  error: closed

After:

  $ adb sideload mysid-ota-424425.zip
  adb: sideload connection failed: no devices/emulators found
  adb: trying pre-KitKat sideload method...
  adb: pre-KitKat sideload connection failed: no devices/emulators found

Also switch the legacy code to just read+write blocks rather than trying to
load the whole OTA package into RAM (which is in short supply on Win32).
This is probably of no practical use other than that it lets us report a
better error message (better than "terminate called after throwing an
instance of 'std::bad_alloc'").

Bug: https://issuetracker.google.com/37139736
Test: "adb sideload" with no device/a mysid/an angler
Change-Id: Ia568044aac61bd054301ebfd7fcd5ad5d6f3147a
1 file changed
tree: 950df5cdfe743f1762bd6ae5ac10e8ae7d8b90f3
  1. client/
  2. daemon/
  3. sysdeps/
  4. .clang-format ⇨ ../.clang-format-4
  5. adb.cpp
  6. adb.h
  7. adb_auth.h
  8. adb_auth_host.cpp
  9. adb_client.cpp
  10. adb_client.h
  11. adb_io.cpp
  12. adb_io.h
  13. adb_io_test.cpp
  14. adb_listeners.cpp
  15. adb_listeners.h
  16. adb_listeners_test.cpp
  17. adb_mdns.h
  18. adb_trace.cpp
  19. adb_trace.h
  20. adb_unique_fd.h
  21. adb_utils.cpp
  22. adb_utils.h
  23. adb_utils_test.cpp
  24. adbd_auth.cpp
  25. Android.mk
  26. bugreport.cpp
  27. bugreport.h
  28. bugreport_test.cpp
  29. commandline.cpp
  30. commandline.h
  31. console.cpp
  32. CPPLINT.cfg
  33. diagnose_usb.cpp
  34. diagnose_usb.h
  35. fdevent.cpp
  36. fdevent.h
  37. fdevent_test.cpp
  38. fdevent_test.h
  39. file_sync_client.cpp
  40. file_sync_service.cpp
  41. file_sync_service.h
  42. framebuffer_service.cpp
  43. jdwp_service.cpp
  44. line_printer.cpp
  45. line_printer.h
  46. MODULE_LICENSE_APACHE2
  47. NOTICE
  48. OVERVIEW.TXT
  49. protocol.txt
  50. remount_service.cpp
  51. remount_service.h
  52. security_log_tags.h
  53. services.cpp
  54. services.h
  55. SERVICES.TXT
  56. set_verity_enable_state_service.cpp
  57. shell_service.cpp
  58. shell_service.h
  59. shell_service_protocol.cpp
  60. shell_service_protocol_test.cpp
  61. shell_service_test.cpp
  62. socket.h
  63. socket_spec.cpp
  64. socket_spec.h
  65. socket_spec_test.cpp
  66. socket_test.cpp
  67. sockets.cpp
  68. sockets.dia
  69. SYNC.TXT
  70. sysdeps.h
  71. sysdeps_test.cpp
  72. sysdeps_unix.cpp
  73. sysdeps_win32.cpp
  74. sysdeps_win32_test.cpp
  75. test_adb.py
  76. test_device.py
  77. trace.sh
  78. transport.cpp
  79. transport.h
  80. transport_local.cpp
  81. transport_mdns.cpp
  82. transport_mdns_unsupported.cpp
  83. transport_test.cpp
  84. transport_usb.cpp
  85. usb.h