Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / modules / adb / 2218c757f1c34ef4cc9738e3dc05f6f37847ebe2
commit2218c757f1c34ef4cc9738e3dc05f6f37847ebe2[log] [tgz]
authorSpencer Low <CompareAndSwap@gmail.com>Wed Aug 05 19:26:50 2015 -0700
committerSpencer Low <CompareAndSwap@gmail.com>Wed Aug 05 19:26:50 2015 -0700
tree550ad20863d6ff305343b50d7a30669906539f76
parenta7549c6131a2f09612156bdf7a332a69ec1ebadd [diff]
adb: fix killing of old version of adb process

The original code was:

  if (strcmp(__adb_error, "unknown host service") != 0)

But that was changed by 04a98c2affb9f4a2b5baf79418793d0e6ba8d766 to:

  if (*error == "unknown host service") {

I think the comparison should be != so that "unknown host service"
falls-through and kills the server, and so if it is some other error,
that the other error is returned immediately.

Change-Id: Ia490a4a870d1d123a3c5ab258dd5fa0930e8032d
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
1 file changed
tree: 550ad20863d6ff305343b50d7a30669906539f76
  1. client/
  2. daemon/
  3. .clang-format
  4. __init__.py
  5. adb.cpp
  6. adb.h
  7. adb_auth.cpp
  8. adb_auth.h
  9. adb_auth_client.cpp
  10. adb_auth_host.cpp
  11. adb_client.cpp
  12. adb_client.h
  13. adb_io.cpp
  14. adb_io.h
  15. adb_io_test.cpp
  16. adb_listeners.cpp
  17. adb_listeners.h
  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. device.py
  27. fdevent.cpp
  28. fdevent.h
  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. qemu_tracing.cpp
  42. qemu_tracing.h
  43. remount_service.cpp
  44. remount_service.h
  45. services.cpp
  46. SERVICES.TXT
  47. set_verity_enable_state_service.cpp
  48. sockets.cpp
  49. sockets.dia
  50. SYNC.TXT
  51. sysdeps.h
  52. sysdeps_win32.cpp
  53. test_adb.py
  54. test_device.py
  55. test_track_devices.cpp
  56. transport.cpp
  57. transport.h
  58. transport_local.cpp
  59. transport_test.cpp
  60. transport_usb.cpp
  61. usb_linux.cpp
  62. usb_linux_client.cpp
  63. usb_osx.cpp
  64. usb_windows.cpp