43c02b27cd
Revert "adb: move adb_strerror to sysdeps/win32/errno.cpp."
...
This reverts commit 4fba3d2638
2016-12-05 13:15:55 -08:00
d5286d376b
adb: move adb_strerror to sysdeps/win32/errno.cpp.
...
am: 4fba3d2638
2016-12-05 20:35:41 +00:00
4733b631ed
adb: extend sync protocol's stat support.
...
am: d6d5c38469
2016-12-05 20:35:36 +00:00
97e228e903
Merge changes I9df4d6fa,I841123de
...
* changes:
adb: move adb_strerror to sysdeps/win32/errno.cpp.
adb: extend sync protocol's stat support.
2016-12-05 20:31:55 +00:00
32ca0ab616
Merge "Remove unused adb_set_transport."
...
am: b898ce00fa
2016-12-03 04:23:10 +00:00
de80be39aa
Remove unused adb_set_transport.
...
Bug: N/A
Test: builds
Change-Id: I0824d29c080c47e1002abf3520ebed8996bcbcc6
2016-12-02 12:53:09 -08:00
4fba3d2638
adb: move adb_strerror to sysdeps/win32/errno.cpp.
...
Bug: none
Test: mma
Change-Id: I9df4d6faf9883a78f50ca6b2b7c35f095d06ae20
2016-11-30 13:23:21 -08:00
d6d5c38469
adb: extend sync protocol's stat support.
...
Extend the file sync protocol to support calling regular stat (instead
of lstat), return error codes, and provide the entire stat struct.
Bug: http://b/33058958
Test: python test_device.py with both old and new adbd
Change-Id: I841123debc380f86194a19e91c97d85160112144
2016-11-30 13:23:21 -08:00
b6e9e5ddde
adb: be more permissive in test_push_error_reporting.
...
am: 79ce3fe7db
2016-11-29 18:18:49 +00:00
68fd28e334
adb: make sure that file mode macros match linux.
...
am: 05a3abfef3
2016-11-29 18:18:44 +00:00
79ce3fe7db
adb: be more permissive in test_push_error_reporting.
...
Be agnostic to whether /system is writable when testing push error
reporting.
Test: python test_device.py
Change-Id: I1d03564fa35442c20e2c96a7f5b56d39868efc52
2016-11-21 18:39:21 -08:00
05a3abfef3
adb: make sure that file mode macros match linux.
...
We use <sys/stat.h> mode macros on the host to parse modes sent over
from the device, so they had better match. Add static_asserts to ensure
this.
(Also, fix the cases where they don't.)
Test: mma -j48, compiled the static_asserts on darwin manually
Change-Id: I883e4e6c7489ea64d3c02d26790ac8293366d989
2016-11-21 18:39:21 -08:00
c2102a7b8f
Merge "adb: fix progress percentage when pulling symlinks."
...
am: 453db013b0
2016-11-18 02:17:56 +00:00
453db013b0
Merge "adb: fix progress percentage when pulling symlinks."
2016-11-18 02:13:19 +00:00
da1f279509
adb: fix progress percentage when pulling symlinks.
...
The adb protocol currently only supports lstat with no way of finding
the target of a symlink, so pulling a symlink that points to a file
looks like pulling a file with length equal to the length of path to
the symlink's target. Pulling a file that's sufficiently large can
overflow the int used to calculate percentage, and result in a bogus
completion percentage being displayed.
Bug: http://b/29277448
Test: adb pull /dev/block/platform/soc.0/f9824900.sdhci/by-name/system
Change-Id: I42d180550ac2aa9e4705676ccbb20f5db789fb8d
2016-11-17 16:17:07 -08:00
8e5fb5a0e7
Merge "Remove dead code."
...
am: 3bde05d928
2016-11-17 20:39:22 +00:00
3bde05d928
Merge "Remove dead code."
2016-11-17 20:29:10 +00:00
284f07bd9d
Remove dead code.
...
At this point, we can't write to oom_score_adj anyway.
Bug: https://code.google.com/p/android/issues/detail?id=227721
Test: boots, adb shell still works
Change-Id: I07e6ad32765f6582f316973547a3a3d552808287
2016-11-17 10:32:16 -08:00
27bbe8bfb2
Merge "adb: add sysdeps/chrono.h for chrono literals on Win32."
...
am: e631e470e0
2016-11-16 22:29:30 +00:00
4602adbcd3
adb: add sysdeps/chrono.h for chrono literals on Win32.
...
Bug: http://b/32878766
Test: mma
Change-Id: Iaa89d4eadf07e63d6d7205057435a6c7fb5d4ec5
2016-11-16 12:14:59 -08:00
2278b50f24
Merge "Switch adb over to <chrono>."
...
am: 59826ddee5
2016-11-16 20:14:20 +00:00
dbe91eee26
Switch adb over to <chrono>.
...
Clearer code, and lets us lose some more portability cruft.
Bug: http://b/32878766
Test: manual
Change-Id: Ie44928bbf8d68a74127aaf76e7e0060e25fa2cc8
2016-11-16 09:12:12 -08:00
c6fbcd7579
Merge "Set file capabilities after writing file data"
...
am: dd4e5ae943
2016-11-03 17:29:31 +00:00
d0515e7165
Set file capabilities after writing file data
...
File capabilities will be cleared if we set them before writing file data.
Bug: 32543395
Change-Id: I88cc0a0ec23cd6fc6dbe86c93a76914809d7e5f9
2016-11-02 16:37:11 -07:00
1d51d6d6aa
Merge "adb: add `adb reconnect offline` to reconnect offline devices."
...
am: 0945380e36
2016-10-31 21:33:19 +00:00
0945380e36
Merge "adb: add `adb reconnect offline` to reconnect offline devices."
2016-10-31 21:26:23 +00:00
22d2b3e1c2
adb: add `adb reconnect offline` to reconnect offline devices.
...
Add a command to reconnect offline/unauthorized devices, mainly for use
with the inotify-monitoring of vendor key directories added by 2e671202http://b/29273531
Test: manually tested with a sailfish + copying vendor keys
Change-Id: If34cccee4ae553ada65d128b57d03cba8c0d7c46
2016-10-27 17:13:23 -07:00
a4f497e0a2
Merge "Make "adb logcat" pass $ANDROID_LOG_TAGS through again."
...
am: b838ff65d9
2016-10-27 01:10:07 +00:00
90390302d5
Make "adb logcat" pass $ANDROID_LOG_TAGS through again.
...
But not for Windows, because even dealing with environment variables is
too hard there (and no Windows user has complained yet).
Bug: http://b/30184452
Test: manual
Change-Id: I2d60049ed0049a9532414a7cdecbd0687e06aba7
2016-10-26 15:12:14 -07:00
66321bc889
Merge "Improve "adb install" diagnostics."
...
am: a16ae8717c
2016-10-26 18:37:34 +00:00
a16ae8717c
Merge "Improve "adb install" diagnostics."
2016-10-26 18:25:59 +00:00
02ee1725ae
Merge "Make "adb bugreport"'s .zip check case-insensitive."
...
am: da6fe65000
2016-10-26 15:39:50 +00:00
7acce1b0ab
Make "adb bugreport"'s .zip check case-insensitive.
...
Bug: TODO
Test: manual
Change-Id: I0ece7d8dcb708e3755477f7df5ff03807fd227f2
2016-10-25 17:24:54 -07:00
7288478443
Improve "adb install" diagnostics.
...
Bug: http://b/32094640
Test: manual testing
Change-Id: I661936eabd3bdd8aa7ee8cc0e398a7cc7d4ddbbb
2016-10-25 17:23:40 -07:00
e060cdadc8
Merge "Allow multiple tcp adb connection to same device."
...
am: 4818194a25
2016-10-24 23:36:44 +00:00
4818194a25
Merge "Allow multiple tcp adb connection to same device."
2016-10-24 23:31:14 +00:00
8baf1198ee
adb: fix test_sighup.
...
am: 470622f064
2016-10-24 21:18:58 +00:00
a06580956e
adb: fix race condition in test_non_interactive_sigint.
...
am: e76b9f3dde
2016-10-24 21:18:51 +00:00
63660add3f
Merge changes I34ba5757,Ie65a762a
...
* changes:
adb: fix test_sighup.
adb: fix race condition in test_non_interactive_sigint.
2016-10-24 21:13:18 +00:00
470622f064
adb: fix test_sighup.
...
Bug: http://b/32336914
Test: python test_device.py
Change-Id: I34ba5757b5e650d79327dc6779064acd850ce28e
2016-10-24 13:34:20 -07:00
e76b9f3dde
adb: fix race condition in test_non_interactive_sigint.
...
Fix race condition in the test_non_interactive_sigint test by
looping for a while.
Bug: http://b/32336914
Test: python test_device.py
Change-Id: Ie65a762ad6f04815231add5444762c4c0ffd31cb
2016-10-24 13:34:17 -07:00
043912ec11
Allow multiple tcp adb connection to same device.
...
This worked before Kitkat, and then we lost this feature in Kitkat.
Now I make the register logic in server_socket_thread as same as qemu_socket_thread.
Test: manual - build emulator image and connect from different adb client.
Bug: 32341562
Change-Id: I7b4831d280048d2a3796be3522bd3b8fbc1ade6b
Signed-off-by: Tao Wu <lepton@google.com>
2016-10-22 12:54:30 -07:00
f58d06a918
Merge "Move "adb shell" over to getopt(3), and allow -tt on old devices."
...
am: 620469a4ac
2016-10-22 18:11:44 +00:00
cabfa1177f
Move "adb shell" over to getopt(3), and allow -tt on old devices.
...
From the bug:
Say we run a new adb against an old device (like KitKat). Even with a new
client ADB, in this configuration, "adb shell" will create a remove tty
unconditionally. So if the user runs "adb shell -t -t", we shouldn't fail
with a message about the remote device not supporting -tT options --- the
user asked to create a tty unconditionally, and since we're going to create
a tty unconditionally, we should just succeed. (That it's going to succeed
due to protocol inadequacy instead of succeeding on purpose is irrelevant.)
That adb fails in this case makes scripts more complicated, since they can't
just pass "-t -t" unconditionally if they want a tty and to work on all
device versions, even if the script requires a new-ish adb locally.
Bug: http://b/32216152
Bug: http://b/32219151
Test: test_device.py
Change-Id: I8ab7c8dfa212209a7ab43c1f0832eeac26d2e42f
2016-10-21 14:22:40 -07:00
e02e11835d
Merge "adb: fix undefined behavior"
...
am: 1edd61ce5d
2016-10-20 04:38:12 +00:00
ef57d54f80
adb: fix undefined behavior
...
system/core/adb/shell_service_protocol_test.cpp:94:14: warning: Null
passed to a callee that requires a non-null 1st parameter
!memcmp(data, protocol->data(), data_length));
C99 requires memcmp() to take non-null pointers.
Bug: none
Test: clang-tidy doesn't complain
Change-Id: I77b8d9373fa257a070ffc7fd318231c2c9ea84c3
2016-10-19 19:39:44 -07:00
8648bddf24
adb: use __android_log_is_debuggable()
...
am: 97787a00e6
2016-10-18 16:46:15 +00:00
97787a00e6
adb: use __android_log_is_debuggable()
...
Test: compile and months of adb functionality use
Bug: 27566046
Bug: 31456426
Change-Id: I6568eea0eda8dc67dec2ba34cd4c3f56fb0ff0e9
2016-10-14 11:12:24 -07:00
19340be9fe
Merge "Rely on the platform -std default." am: 955648a915 am: 4594f50635
...
am: f1dffe0501
2016-10-14 02:56:09 +00:00
f1dffe0501
Merge "Rely on the platform -std default." am: 955648a915
...
am: 4594f50635
2016-10-14 02:47:44 +00:00
4594f50635
Merge "Rely on the platform -std default."
...
am: 955648a915
2016-10-14 02:45:03 +00:00
955648a915
Merge "Rely on the platform -std default."
2016-10-14 02:28:38 +00:00
4b9774fe97
Merge "Fallback to IPv6 when IPv4 is not available in adb" am: c32d7fd66f am: 5b7c6772b0
...
am: 27c6c4cf04
2016-10-14 01:51:54 +00:00
a4398c1abe
Merge "Move off std::sto* function which abort on failure."
2016-10-14 01:51:10 +00:00
27c6c4cf04
Merge "Fallback to IPv6 when IPv4 is not available in adb" am: c32d7fd66f
...
am: 5b7c6772b0
2016-10-14 01:46:26 +00:00
5b7c6772b0
Merge "Fallback to IPv6 when IPv4 is not available in adb"
...
am: c32d7fd66f
2016-10-14 01:43:55 +00:00
da46b392f1
Move off std::sto* function which abort on failure.
...
Bug: http://b/31403370
Test: builds, boots, libbase tests pass
Change-Id: I89cd7ca3d8f1c8a1bad0ddf3043439449d19a293
2016-10-13 15:34:05 -07:00
7b700763f5
Fallback to IPv6 when IPv4 is not available in adb
...
Test: manual - make sure it works in both IPv4/IPv6 env.
BUG: 31537253
Change-Id: Ica492bff34a8c0441516a213d0e8b78fcdfd3282
Signed-off-by: Tao Wu <lepton@google.com>
2016-10-13 08:54:43 -07:00
fc485e4488
Merge "Start retiring socket_loopback_client." am: 58f7f61266 am: cd0e8cfd33
...
am: aa509a3e9d
2016-10-13 15:00:24 +00:00
aa509a3e9d
Merge "Start retiring socket_loopback_client." am: 58f7f61266
...
am: cd0e8cfd33
2016-10-13 14:50:50 +00:00
cd0e8cfd33
Merge "Start retiring socket_loopback_client."
...
am: 58f7f61266
2016-10-13 14:43:05 +00:00
58f7f61266
Merge "Start retiring socket_loopback_client."
2016-10-13 14:38:48 +00:00
7bdbbfb0ef
Merge "Fix adb flakiness on reboot" am: f7a1c476ff am: d0dead710b
...
am: e93241e377
2016-10-12 00:49:27 +00:00
e93241e377
Merge "Fix adb flakiness on reboot" am: f7a1c476ff
...
am: d0dead710b
2016-10-12 00:44:48 +00:00
d0dead710b
Merge "Fix adb flakiness on reboot"
...
am: f7a1c476ff
2016-10-12 00:36:30 +00:00
1197952e71
Fix adb flakiness on reboot
...
bug: 31950237
There are two lists of active ADB transports (devices),
and with the emulator, they can go out of sync.
This CL more conservatively checks if there are no
transports in either list before commiting to
register a new transport for the emulator.
(cherry picked from commit edaedfd5da
2016-10-11 23:19:51 +00:00
139b372fab
Start retiring socket_loopback_client.
...
Bug: http://b/31537253
Test: can still talk to adb
Change-Id: Icfd7f00d35cf963befc139e81904790b4b8b67c0
2016-10-11 13:45:03 -07:00
f369babcb8
Merge "Remove useless arguments from is_adb_interface." am: bd6c6eb0e4 am: db50d1d6ef
...
am: 0a629b4bdd
2016-10-11 17:51:40 +00:00
0a629b4bdd
Merge "Remove useless arguments from is_adb_interface." am: bd6c6eb0e4
...
am: db50d1d6ef
2016-10-11 17:42:47 +00:00
db50d1d6ef
Merge "Remove useless arguments from is_adb_interface."
...
am: bd6c6eb0e4
2016-10-11 17:36:09 +00:00
144abd8cb2
Merge "liblog: adb: move security interfaces to private" am: 09dac589f1 am: 586c6985cf
...
am: 4b5456eacc
2016-10-10 23:34:54 +00:00
4b5456eacc
Merge "liblog: adb: move security interfaces to private" am: 09dac589f1
...
am: 586c6985cf
2016-10-10 23:29:55 +00:00
bd6c6eb0e4
Merge "Remove useless arguments from is_adb_interface."
2016-10-10 22:50:13 +00:00
586c6985cf
Merge "liblog: adb: move security interfaces to private"
...
am: 09dac589f1
2016-10-10 22:04:39 +00:00
36e0d390a2
Rely on the platform -std default.
...
Bug: http://b/32019064
Test: builds
Change-Id: I18a1d816d63b64601485045070851f32d44e85eb
2016-10-10 14:31:12 -07:00
30186df0f0
Remove useless arguments from is_adb_interface.
...
Test: mma
Change-Id: I8b7b411d7d5ec9d401b61ed8f817b98c61114d4f
2016-10-10 13:44:00 -07:00
6debf985aa
liblog: adb: move security interfaces to private
...
Test: Compile & adb functioning
Bug: 19235719
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I7ad8963bcca3d8b5c37b547c11d163b652d35556
2016-10-10 15:15:45 +00:00
f883e2f65c
Merge "adb: rationalize types." am: 8caf4e7443 am: e335bea277
...
am: 010818f313
2016-10-07 20:48:19 +00:00
010818f313
Merge "adb: rationalize types." am: 8caf4e7443
...
am: e335bea277
2016-10-07 20:44:43 +00:00
e335bea277
Merge "adb: rationalize types."
...
am: 8caf4e7443
2016-10-07 20:41:16 +00:00
06d61d4d96
adb: rationalize types.
...
Use fixed length types for structs going over the wire, constify
arguments where possible, use char* instead of unsigned char* for
apacket data, and assorted other refactoring.
Bug: http://b/29273531
Test: python test_device.py with every combination of old/new adb and adbd
Change-Id: I0b6f818a32be5386985aa4519f542003cf427f9d
2016-10-06 14:50:02 -07:00
e1afd17d75
Merge "adb: split up adb_auth.cpp." am: 4a8b178c97 am: 4546c8ac3d
...
am: 58a5e5a50b
2016-10-06 19:54:06 +00:00
58a5e5a50b
Merge "adb: split up adb_auth.cpp." am: 4a8b178c97
...
am: 4546c8ac3d
2016-10-06 19:50:37 +00:00
4546c8ac3d
Merge "adb: split up adb_auth.cpp."
...
am: 4a8b178c97
2016-10-06 19:47:11 +00:00
4a8b178c97
Merge "adb: split up adb_auth.cpp."
2016-10-06 19:37:31 +00:00
3bd2879d8e
adb: split up adb_auth.cpp.
...
All of the functions in adb_auth.cpp were used in only one of
adb/adbd. Split up them up into adb_auth_host.cpp and adbd_auth.cpp
respectively.
Bug: http://b/29273531
Test: built and flashed bullhead, adb still works
Change-Id: Ib610c5157522634cc273511175152f1306cc52a7
2016-10-06 12:36:26 -07:00
4fa6e4855b
Merge "adb: Remove the obsolete include path to ext4_utils." am: 9f828a5383 am: a00020317e
...
am: 9766909149
2016-10-06 06:29:57 +00:00
9766909149
Merge "adb: Remove the obsolete include path to ext4_utils." am: 9f828a5383
...
am: a00020317e
2016-10-06 06:26:25 +00:00
a00020317e
Merge "adb: Remove the obsolete include path to ext4_utils."
...
am: 9f828a5383
2016-10-06 06:23:27 +00:00
fee161d189
adb: Remove the obsolete include path to ext4_utils.
...
Since commit 8ad80763e4
2016-10-05 18:06:03 -07:00
9f6b98dec0
system/core Replace log/log.h with android/log.h am: ff2dcd9af9 am: cac331afd9
...
am: 0308b0eabd
2016-09-30 22:18:18 +00:00
0308b0eabd
system/core Replace log/log.h with android/log.h am: ff2dcd9af9
...
am: cac331afd9
2016-09-30 22:13:00 +00:00
cac331afd9
system/core Replace log/log.h with android/log.h
...
am: ff2dcd9af9
2016-09-30 22:09:28 +00:00
ff2dcd9af9
system/core Replace log/log.h with android/log.h
...
Should use android/log.h instead of log/log.h as a good example
to all others. Adjust header order to comply with Android Coding
standards.
Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I33a8fb4e754d2dc4754d335660c450e0a67190fc
2016-09-30 12:47:05 -07:00
a6d5587f78
resolve merge conflicts of b40756a to nyc-dev-plus-aosp
...
am: fe807214ef
2016-09-30 17:07:03 +00:00
fe807214ef
resolve merge conflicts of b40756a to nyc-dev-plus-aosp
...
Change-Id: Ic1aa6fd6ab66ca8fb7cf434a3d0679a41288e4a7
2016-09-30 10:00:02 -07:00
b40756ac28
resolve merge conflicts of 50cb973 to stage-aosp-master
...
Change-Id: Idf0d02687cc47f64acfdd3da623c7a7a62043651
2016-09-30 09:08:23 -07:00
4bf9bc1ac7
Improve "adb help" output.
...
The specific request was to document $ADB_VENDOR_KEYS, but since I'm here,
let's try to make the help output shorter but more useful...
Bug: http://b/18437888
Test: adb help
Change-Id: I77135d4e666f19524f880228d27d87ba881672b5
2016-09-28 15:29:19 -07:00
5cab7cc637
Merge "adb: fix host-side serial number parsing for IPv6." am: b1c4d90215 am: 94c652ed31
...
am: dde69001c2
2016-09-28 17:46:46 +00:00
dde69001c2
Merge "adb: fix host-side serial number parsing for IPv6." am: b1c4d90215
...
am: 94c652ed31
2016-09-28 17:41:16 +00:00
94c652ed31
Merge "adb: fix host-side serial number parsing for IPv6."
...
am: b1c4d90215
2016-09-28 17:35:47 +00:00
b1c4d90215
Merge "adb: fix host-side serial number parsing for IPv6."
2016-09-28 17:30:29 +00:00
a539d4c04c
Merge "adb: fix IOKit handle leaks on OS X." am: a2aff3f809 am: 279a1ea5b0
...
am: dbb34a87b4
2016-09-27 20:52:26 +00:00
dbb34a87b4
Merge "adb: fix IOKit handle leaks on OS X." am: a2aff3f809
...
am: 279a1ea5b0
2016-09-27 20:45:55 +00:00
279a1ea5b0
Merge "adb: fix IOKit handle leaks on OS X."
...
am: a2aff3f809
2016-09-27 20:43:24 +00:00
a2aff3f809
Merge "adb: fix IOKit handle leaks on OS X."
2016-09-27 20:38:37 +00:00
b6a2f59515
adb: fix IOKit handle leaks on OS X.
...
Bug: https://code.google.com/p/android/issues/detail?id=219085
Test: Removed sleep in RunLoopThread, compared before/after this patch
Change-Id: Ia65bbedfb7d47bdb02bdfb69778784e5e855900b
2016-09-27 12:36:58 -07:00
9daaf229d0
Merge "Switch adb to <android-base/properties.h>." am: d9a23b5733 am: 5dc7e6a79a
...
am: 8b7751d360
2016-09-26 22:25:21 +00:00
8b7751d360
Merge "Switch adb to <android-base/properties.h>." am: d9a23b5733
...
am: 5dc7e6a79a
2016-09-26 22:22:48 +00:00
5dc7e6a79a
Merge "Switch adb to <android-base/properties.h>."
...
am: d9a23b5733
2016-09-26 22:19:04 +00:00
ffdec18017
Switch adb to <android-base/properties.h>.
...
Bug: http://b/23102347
Test: manual
Change-Id: Iffa66258c01f84f41b9af99ab5e768a0a2669106
2016-09-26 13:14:14 -07:00
0e0cf74c52
Merge "Ignore setsid error in some cases." am: 3562fd0fa8 am: 324acdce69
...
am: f7756b89e9
2016-09-22 22:53:08 +00:00
6d317aca93
Merge "adb: kill adb_mutex_t, adb_cond_t." am: 7e4d1db957 am: 72c679d6d0
...
am: 71970fc473
2016-09-22 22:52:16 +00:00
f7756b89e9
Merge "Ignore setsid error in some cases." am: 3562fd0fa8
...
am: 324acdce69
2016-09-22 11:55:23 +00:00
71970fc473
Merge "adb: kill adb_mutex_t, adb_cond_t." am: 7e4d1db957
...
am: 72c679d6d0
2016-09-22 11:54:05 +00:00
324acdce69
Merge "Ignore setsid error in some cases."
...
am: 3562fd0fa8
2016-09-22 08:22:14 +00:00
72c679d6d0
Merge "adb: kill adb_mutex_t, adb_cond_t."
...
am: 7e4d1db957
2016-09-22 08:21:30 +00:00
3562fd0fa8
Merge "Ignore setsid error in some cases."
2016-09-22 06:28:51 +00:00
7e4d1db957
Merge "adb: kill adb_mutex_t, adb_cond_t."
2016-09-22 02:15:00 +00:00
0cd3ae1c28
adb: kill adb_mutex_t, adb_cond_t.
...
Now that we have support for std::mutex and std::condition_variable on
Windows, remove our mutex compatibility layer in favor of the C++ one.
Bug: http://b/31653591
Test: mma && $ANDROID_HOST_OUT/nativetest64/adb_test/adb_test && \
python test_adb.py && python test_device.py
(also on Windows)
Change-Id: I5b7ed9c45cc2a32edcf4e77b56dc28e441f15f34
2016-09-21 17:22:22 -07:00
88e36027ed
Merge "adb: parse tcp socket specs with base::ParseNetAddress." am: efee71c2de am: 67ed583564
...
am: 837f2cef9a
2016-09-21 20:38:59 +00:00
837f2cef9a
Merge "adb: parse tcp socket specs with base::ParseNetAddress." am: efee71c2de
...
am: 67ed583564
2016-09-21 20:31:28 +00:00
67ed583564
Merge "adb: parse tcp socket specs with base::ParseNetAddress."
...
am: efee71c2de
2016-09-21 20:28:57 +00:00
efee71c2de
Merge "adb: parse tcp socket specs with base::ParseNetAddress."
2016-09-21 20:26:36 +00:00
73d55aaab2
adb: fix host-side serial number parsing for IPv6.
...
When the adb client sends a command to the adb server targeting a
particular device serial, it looks something like this:
host-serial:<serial>:<command>
But if <serial> happens to be an IPv6 address (e.g. when `adb connect`
targets IPv6), the current parsing code doesn't handle the additional
colons properly. This CL fixes the host-serial parsing to handle this
case.
This only affects commands that explicitly name a device serial, e.g.:
adb -s <IPv6> shell
adb -s <IPv6> forward <port> <port>
Implicitly using a single attached device was unaffected by this bug.
Bug: http://b/30891386
Test: `adb -s [fe80::ba27:ebff:feb1:934%eth2]:5555 shell` works now,
and new unittests pass.
Change-Id: Iffe784e61432ae94eb96ed3c8477900a3e807329
2016-09-21 13:00:32 -07:00
c8fab89f1b
Ignore setsid error in some cases.
...
If the calling process has already been a leading process of session.
setsid just fail with EPERM, ignore such error.
Test: killall adb;exec 3>f;adb fork-server server --reply-fd 3 & cat f
Change-Id: I1aeac079f29e10aa63ed724b5a43663f25c25ad5
Signed-off-by: Tao Wu <lepton@google.com>
2016-09-20 18:15:22 -07:00
11a172e5b7
Merge "base: rename unique_fd::clear() to unique_fd::reset()." am: 14d3a1ac9d am: 8c9ecb9c2c
...
am: bac29cb665
2016-09-21 01:12:57 +00:00
bac29cb665
Merge "base: rename unique_fd::clear() to unique_fd::reset()." am: 14d3a1ac9d
...
am: 8c9ecb9c2c
2016-09-21 01:10:23 +00:00
8c9ecb9c2c
Merge "base: rename unique_fd::clear() to unique_fd::reset()."
...
am: 14d3a1ac9d
2016-09-21 01:07:18 +00:00
14d3a1ac9d
Merge "base: rename unique_fd::clear() to unique_fd::reset()."
2016-09-21 01:03:06 +00:00
1099215e30
adb: parse tcp socket specs with base::ParseNetAddress.
...
libbase already has IPv6-aware address parsing, so use it instead of
adb's handrolled IPv4-only parsing.
Bug: http://b/31537253
Change-Id: I4e9ce56b55d7d02787c0fa67b724490bf49ce479
Test: mma && adb start-server && \
adb -L 'tcp:[::ffff:127.0.0.1]:5037' devices && \
adb -L 'tcp:localhost:5037' devices && \
adb -L 'tcp:127.0.0.1:5037' devices && \
adb -L 'tcp:5037' devices && \
$ANDROID_HOST_OUT/nativetest64/adb_test/adb_test
2016-09-20 13:55:43 -07:00
502231b6be
Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT" am: 4159568548 am: bcc419edad
...
am: 18b1a9901e
2016-09-20 00:56:43 +00:00
18b1a9901e
Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT" am: 4159568548
...
am: bcc419edad
2016-09-19 21:02:24 +00:00
bcc419edad
Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT"
...
am: 4159568548
2016-09-19 20:53:48 +00:00
4159568548
Merge "Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT"
2016-09-19 20:35:11 +00:00
5d1b1a8b91
base: rename unique_fd::clear() to unique_fd::reset().
...
unique_fd is modeled on unique_ptr, so make this consistent.
Test: m checkbuild
Change-Id: Ia6a77095dc18746fbb432e96bb8dccfc049c57f6
2016-09-19 11:24:58 -07:00
135f4ab3dd
Fix bug: Doesn't respect ANDROID_ADB_SERVER_PORT
...
BUG: 31549442
Test: export ANDROID_ADB_SERVER_PORT=12345;killall adb;adb devices
Change-Id: If2bfaf44c6567af16cae0d4def2f11be39c2d437
Signed-off-by: Tao Wu <lepton@google.com>
2016-09-16 17:13:48 -07:00
48b0a6b471
Merge "Use <condition_variable> and <mutex.h> from MinGW" am: a3d7b240f1 am: 331ec060ca
...
am: 11836956bc
2016-09-16 22:24:27 +00:00
11836956bc
Merge "Use <condition_variable> and <mutex.h> from MinGW" am: a3d7b240f1
...
am: 331ec060ca
2016-09-16 22:21:24 +00:00
331ec060ca
Merge "Use <condition_variable> and <mutex.h> from MinGW"
...
am: a3d7b240f1
2016-09-16 22:15:21 +00:00
a3d7b240f1
Merge "Use <condition_variable> and <mutex.h> from MinGW"
2016-09-16 21:59:35 +00:00
264b3465dd
adb: let `adb push` follow symlinks. am: 94dc19ff57 am: 30ecda227c
...
am: 3e64efbced
2016-09-15 02:32:35 +00:00
3e64efbced
adb: let `adb push` follow symlinks. am: 94dc19ff57
...
am: 30ecda227c
2016-09-15 02:29:35 +00:00
30ecda227c
adb: let `adb push` follow symlinks.
...
am: 94dc19ff57
2016-09-15 02:27:33 +00:00
94dc19ff57
adb: let `adb push` follow symlinks.
...
Bug: http://b/31491920
Test: touch foo; ln -s foo bar; adb push bar /data/local/tmp
Test: python test_device.py
Change-Id: I0a00b3d49fdf7206e27d66ac110b56e22449a1ad
2016-09-14 17:08:22 -07:00
7eaef8a494
Use <condition_variable> and <mutex.h> from MinGW
...
New MinGW prebuilts update includes pthreads and C++11 threads support.
Use mutex.h and condition_variable provided by MinGW.
Test: Build AOSP with new MinGW prebuilts
Change-Id: Ia8f890f86652612df3fc2618c2bfbb450a5a2f52
2016-09-06 13:49:07 -07:00
cdf8fba6a1
Merge "Precise command constants on adb/protoxol.txt" am: 85a78f19b1 am: f8188895a1
...
am: 7bcc5bd0d0
2016-09-06 05:19:15 +00:00
7bcc5bd0d0
Merge "Precise command constants on adb/protoxol.txt" am: 85a78f19b1
...
am: f8188895a1
2016-09-06 05:15:45 +00:00
f8188895a1
Merge "Precise command constants on adb/protoxol.txt"
...
am: 85a78f19b1
2016-09-06 05:12:47 +00:00
85a78f19b1
Merge "Precise command constants on adb/protoxol.txt"
2016-09-06 05:04:13 +00:00
Josh Gao