Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_modules_adb / 4d299743b01574ac2070990a701efb99f9b393a9
commit4d299743b01574ac2070990a701efb99f9b393a9[log] [tgz]
authorJosh Gao <jmgao@google.com>Wed Sep 13 13:40:57 2017 -0700
committerJosh Gao <jmgao@google.com>Wed Sep 13 14:31:14 2017 -0700
tree521f5c4324b9214e646ab276176d82c43ef1c3ff
parentb69c78b0f08e804ce00b71ee7085237a4f316037 [diff]
Revert "adb: fix deadlock between transport_unref and usb_close."

This reverts commit e44e98355bf9ee5a87469ce66b2800913a97cfe4.

The mutex lock in transport_unref hides a race that seems otherwise
hard to fix. Specifically, there's no synchronization between acquiring
a transport and attaching it to an asocket*, leading to badness if the
transport is closed in between the two operations.

Fix the original problem the reverted patch addressed by manually
unlocking before calling unregister_usb_transport.

Bug: http://b/65419665
Test: python test_device.py
Change-Id: I0ed0044129b1671b2c5dd1b9fa2e70a9b4475dc5
3 files changed
tree: 521f5c4324b9214e646ab276176d82c43ef1c3ff
  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.bp
  26. Android.mk
  27. bugreport.cpp
  28. bugreport.h
  29. bugreport_test.cpp
  30. commandline.cpp
  31. commandline.h
  32. console.cpp
  33. CPPLINT.cfg
  34. diagnose_usb.cpp
  35. diagnose_usb.h
  36. fdevent.cpp
  37. fdevent.h
  38. fdevent_test.cpp
  39. fdevent_test.h
  40. file_sync_client.cpp
  41. file_sync_service.cpp
  42. file_sync_service.h
  43. framebuffer_service.cpp
  44. jdwp_service.cpp
  45. line_printer.cpp
  46. line_printer.h
  47. MODULE_LICENSE_APACHE2
  48. NOTICE
  49. OVERVIEW.TXT
  50. protocol.txt
  51. remount_service.cpp
  52. remount_service.h
  53. security_log_tags.h
  54. services.cpp
  55. services.h
  56. SERVICES.TXT
  57. set_verity_enable_state_service.cpp
  58. shell_service.cpp
  59. shell_service.h
  60. shell_service_protocol.cpp
  61. shell_service_protocol_test.cpp
  62. shell_service_test.cpp
  63. socket.h
  64. socket_spec.cpp
  65. socket_spec.h
  66. socket_spec_test.cpp
  67. socket_test.cpp
  68. sockets.cpp
  69. sockets.dia
  70. SYNC.TXT
  71. sysdeps.h
  72. sysdeps_test.cpp
  73. sysdeps_unix.cpp
  74. sysdeps_win32.cpp
  75. sysdeps_win32_test.cpp
  76. test_adb.py
  77. test_device.py
  78. trace.sh
  79. transport.cpp
  80. transport.h
  81. transport_local.cpp
  82. transport_mdns.cpp
  83. transport_mdns_unsupported.cpp
  84. transport_test.cpp
  85. transport_usb.cpp
  86. usb.h