Commit graph

3729 commits

Author SHA1 Message Date
Treehugger Robot
01787112bf Merge "Make some fdevent member functions pure virtual." am: b6a6023bda am: dce1b6ebfa am: 1c4902d3bf am: 8bb0bba974
Change-Id: I86581b41b133d4d336f6de4ad13fe93e92423e73
2020-05-13 04:46:52 +00:00
Treehugger Robot
1c4902d3bf Merge "Make some fdevent member functions pure virtual." am: b6a6023bda am: dce1b6ebfa
Change-Id: I84a95074c03d28a487571168b7ad144eb9e65221
2020-05-13 04:09:51 +00:00
Treehugger Robot
b6a6023bda Merge "Make some fdevent member functions pure virtual." 2020-05-13 03:31:03 +00:00
Treehugger Robot
9cc53cc8bd Merge "Add a few more trivial socket_spec.h tests." am: 53053dd1b1 am: 81c0b12c50 am: dfbc5d3853 am: c390ad9d3e
Change-Id: I0c85800f972449bf546e55043be5f31cbc7db197
2020-05-13 01:56:53 +00:00
Treehugger Robot
dfbc5d3853 Merge "Add a few more trivial socket_spec.h tests." am: 53053dd1b1 am: 81c0b12c50
Change-Id: I9e87e70c8421f3cda7d432bd53f28893d28612ee
2020-05-13 01:27:55 +00:00
Elliott Hughes
e65e002102 Add a few more trivial socket_spec.h tests.
Also remove some dead code. The "missing port" case in
parse_tcp_socket_spec hasn't been meaningful since we put the default
port back.

Test: treehugger
Change-Id: I40958f0f1c2dd7f0315142c2c0363a70fe6f80fe
2020-05-12 16:38:11 -07:00
Elliott Hughes
631fe1e6df Make some fdevent member functions pure virtual.
...because that makes our coverage numbers look better. But since there
are only two concrete classes anyway, we weren't gaining much from the
default implementation and it's arguably more intention-revealing now.

Test: treehugger
Change-Id: I7a8a3195023048b1a84277358b857222692d96ee
2020-05-12 16:18:52 -07:00
Josh Gao
126bef3961 Merge changes Id8d9fa6c,I47d3ad50,I7cebbf75,Id10e320a am: a227c19ef2 am: 5954016965 am: da4b7221ff am: f2420d95a2
Change-Id: Ia6ae2cf865a70b621658797adae8b8d868aa508e
2020-05-12 06:36:29 +00:00
Josh Gao
da4b7221ff Merge changes Id8d9fa6c,I47d3ad50,I7cebbf75,Id10e320a am: a227c19ef2 am: 5954016965
Change-Id: If054be91a10b4bd9d3b736f3446d73289526b42d
2020-05-12 05:56:03 +00:00
Josh Gao
a227c19ef2 Merge changes Id8d9fa6c,I47d3ad50,I7cebbf75,Id10e320a
* changes:
  adbd: avoid compiling more code in the daemon.
  adb: don't run all of the tests again over TCP in coverage.
  adbd: respect ADB_TRACE on host adbd.
  adb: mark kMaxProcessNameLength as constexpr.
2020-05-12 05:32:48 +00:00
Treehugger Robot
8b02753be5 Merge changes I24e70952,I652560ad am: 8987016b1e am: e555230b01 am: 63b1e8650c am: c91d52cec6
Change-Id: I9d0592aa5127ebab23768984d07632a982545067
2020-05-12 03:18:37 +00:00
Treehugger Robot
63b1e8650c Merge changes I24e70952,I652560ad am: 8987016b1e am: e555230b01
Change-Id: Id33adfef41b8efe35f2492b85eac4ff5e24acb69
2020-05-12 02:54:41 +00:00
Treehugger Robot
8987016b1e Merge changes I24e70952,I652560ad
* changes:
  adb: use transport-id to make coverage script faster.
  adb: add `adb transport-id` command.
2020-05-12 02:22:27 +00:00
Treehugger Robot
a566cb0967 Merge "Remove unneeded optimize_for lite" am: 1d77251d76 am: 15a669542e am: ff065c3de1 am: 5a5f76ef04
Change-Id: Icb1bff704e760e0c3d20e1bb080f92e83415da86
2020-05-12 00:49:26 +00:00
Treehugger Robot
ff065c3de1 Merge "Remove unneeded optimize_for lite" am: 1d77251d76 am: 15a669542e
Change-Id: If518a31d9063868179cb1138f960e7a2ccb5a998
2020-05-12 00:19:26 +00:00
Treehugger Robot
1d77251d76 Merge "Remove unneeded optimize_for lite" 2020-05-11 23:49:29 +00:00
Chen Zhu
d9685a181c Merge "Add test config for adbd_test and apply MainlineTestModuleController to it" into rvc-dev am: 8950624662 am: 5b59f27e2c am: 03a2f11bcd
Change-Id: I88aba8450d8691f4db5a5b31af9503a24b8138f6
2020-05-09 03:31:00 +00:00
Chen Zhu
466c534eee Merge "Add test config for adbd_test and apply MainlineTestModuleController to it" into rvc-dev am: 8950624662
Change-Id: I21b780a48aa8e8c77d76556403b1570b3b612c08
2020-05-09 03:01:07 +00:00
Chen Zhu
8950624662 Merge "Add test config for adbd_test and apply MainlineTestModuleController to it" into rvc-dev 2020-05-09 02:48:48 +00:00
Chen Zhu
5daea5a6a2 Add test config for adbd_test and apply MainlineTestModuleController to it
to only run the tests when com.google.android.adbd is

installed on device.

Bug: 154845935
Test: m mts && mts-tradefed run mts-adbd
Change-Id: I2f203d25288580a07391703e2b28df54479a69f0
2020-05-08 16:47:07 -07:00
Joshua Duong
6929cb621e Merge "[adb client] Fix mdns discovery service registry." am: 2814928567 am: 6afe9cffb7 am: fbc55bf9e2 am: ffc5105411
Change-Id: Iff42f4c5cdc24f17e3003098b2aa0f639f889199
2020-05-06 22:44:42 +00:00
Joshua Duong
fbc55bf9e2 Merge "[adb client] Fix mdns discovery service registry." am: 2814928567 am: 6afe9cffb7
Change-Id: Ic9c04823096847b205e16fe8c9007fa5b5989f24
2020-05-06 22:14:47 +00:00
Joshua Duong
2814928567 Merge "[adb client] Fix mdns discovery service registry." 2020-05-06 21:39:59 +00:00
Alex Buynytskyy
13e98eaf72 Using ABB for install-multi.
ABB uses single shared CMD for all operations which improves
reliability.

Bug: b/153486595
Fixes: 153486595
Test: atest adb_test adbd_test fastdeploy_test
Change-Id: I1e3da63882c980811ed2e9f5556732b24a041ce5
Merged-In: I1e3da63882c980811ed2e9f5556732b24a041ce5
2020-05-06 14:10:56 -07:00
Josh Gao
a11d27f920 adb: use transport-id to make coverage script faster.
Test: ./coverage/gen_coverage.sh
Change-Id: I24e70952946ad91d51acf9bda386826e4e73a0d2
2020-05-05 14:44:01 -07:00
Josh Gao
3441f232ab adb: add adb transport-id command.
Make it possible to safely script waiting for a device to go away after
root/unroot.

Test: manual
Change-Id: I652560ad1d88a5c6a1e8ea5787c3cf165c82aa63
2020-05-05 14:43:53 -07:00
Joshua Duong
077ac11106 [adb client] Fix mdns discovery service registry.
We were getting stale service ip addresses because we weren't
destroying the sdref correctly.

Also, we were leaking the ResolvedServices when removing it from the
ServiceRegistry. Converted them to smart pointers to fix that.

Bug: 153343580

Test: test_adb.py
Change-Id: Ib7c1dbf54937d4ac6d9885cb5f7289bef616d12e
2020-05-05 00:21:12 -07:00
Luca Stefani
9a3d868d3e Remove unneeded optimize_for lite
* It's already specified in the java_library definition

Test: m deployagent_lib, no warnings
Change-Id: I58fa9af71b8f817da55cfc040fbcbd80fd6425cf
2020-05-01 16:11:22 +02:00
Josh Gao
9f3064f26f adbd: avoid compiling more code in the daemon.
Strip out more code that has no meaning on device, to "improve"
coverage.

Test: test_device.py over TCP
Change-Id: Id8d9fa6cc6c6c30773f67303bcc89e6d60824700
2020-04-27 14:38:28 -07:00
Josh Gao
a786f0a857 adb: don't run all of the tests again over TCP in coverage.
They take forever, and we're only really interested in the transport
related code, so test that more directly.

Test: ./coverage/gen_coverage.sh
Change-Id: I47d3ad50db0f1020fe4b3da5cdfe455190d022b5
2020-04-27 14:38:28 -07:00
Josh Gao
ad18395b65 adbd: respect ADB_TRACE on host adbd.
Test: ADB_TRACE=1 adbd
Change-Id: I7cebbf7596add865fab95f5d6c746c0b8a16997a
2020-04-27 14:38:28 -07:00
Josh Gao
34cd60f075 adb: mark kMaxProcessNameLength as constexpr.
Otherwise, the build fails with -O0.

Test: mma with -O0 in adb_defaults
Change-Id: Id10e320afc183eda5b46555b3b50dd8ffd84a700
2020-04-27 14:38:28 -07:00
Jooyung Han
60985953bd Merge "Add min_sdk_version:R to updatable apexes" 2020-04-25 04:41:43 +00:00
Joshua Duong
31112bfd20 Merge "[adb] Disable _adb._tcp. service auto-connect by default." am: 3eea62432d am: 6974e7b043 am: 7833075fb5 am: 2ff356e07d
Change-Id: I0847e47396ecb05efff6bc9f870cf646446e40b6
2020-04-24 06:41:13 +00:00
Joshua Duong
7833075fb5 Merge "[adb] Disable _adb._tcp. service auto-connect by default." am: 3eea62432d am: 6974e7b043
Change-Id: I6f5fc03d22e516eaf48bcb1e289f6773fa75b384
2020-04-24 06:12:48 +00:00
Joshua Duong
3eea62432d Merge "[adb] Disable _adb._tcp. service auto-connect by default." 2020-04-24 05:38:22 +00:00
Treehugger Robot
7c8d577ef4 Merge "Using ABB for install-multi." am: abc40c7c5d am: 3a9114c337 am: fb3cce57b0 am: 51e059a452
Change-Id: Id28daebe7df1fe0f12278d3d8b14fdcf5750419a
2020-04-24 02:16:47 +00:00
Treehugger Robot
fb3cce57b0 Merge "Using ABB for install-multi." am: abc40c7c5d am: 3a9114c337
Change-Id: I27df5ad5f916bc75ead36cb439aa9370ce9431ca
2020-04-24 01:36:57 +00:00
Treehugger Robot
abc40c7c5d Merge "Using ABB for install-multi." 2020-04-24 01:15:49 +00:00
Joshua Duong
2eedc2303b [adb] Disable _adb._tcp. service auto-connect by default.
Added ADB_MDNS_AUTO_CONNECT envionment variable to control which
services to allow auto-connect. By default, only _adb-tls-connect
services can auto-connect, since these services only auto-connect once
paired. _adb services will try to auto-connect to every service found.

Bug: 152636135

Test: ADB_TRACE=1 adb server nodaemon | grep whitelist
Test: ADB_TRACE=1 ADB_MDNS_AUTO_CONNECT=adb adb server nodaemon | grep whitelist
Test: ADB_TRACE=1 ADB_MDNS_AUTO_CONNECT=adb,adb-tls-connect adb server nodaemon | grep whitelist
Test: ADB_TRACE=1 ADB_MDNS_AUTO_CONNECT=adb-tls-connect adb server nodaemon | grep whitelist
Test: ADB_TRACE=1 ADB_MDNS_AUTO_CONNECT=0 adb server nodaemon | grep whitelist
Test: ADB_TRACE=1 ADB_MDNS_AUTO_CONNECT=1 adb server nodaemon | grep whitelist

Change-Id: Ie562ea24fea3d6d96e67b376a0523b09e2778eb7
2020-04-23 16:55:52 -07:00
Alex Buynytskyy
a59e9b4e70 Using ABB for install-multi.
ABB uses single shared CMD for all operations which improves
reliability.

Bug: b/153486595
Test: atest adb_test adbd_test fastdeploy_test
Change-Id: I1e3da63882c980811ed2e9f5556732b24a041ce5
2020-04-23 16:30:49 -07:00
Josh Gao
d18e757323 Merge changes I5fd3b25d,I6c039b32,I014d7ad2 am: a675727a81 am: 8b0a69f9ad am: 34ce77427f am: 93ccca30f3
Change-Id: I333f00ffd3f6ab5cc09ee4e5caeb71e903fe3cb1
2020-04-23 22:52:21 +00:00
Josh Gao
34ce77427f Merge changes I5fd3b25d,I6c039b32,I014d7ad2 am: a675727a81 am: 8b0a69f9ad
Change-Id: Iae88f73fb69cf3f19d8090a07ef2563966cd8fc8
2020-04-23 22:20:07 +00:00
Josh Gao
0e778dc794 adb: allow filtering by file in coverage/show.sh.
Test: ./coverage.sh transport.cpp
Change-Id: I5fd3b25d9b3edd7a9131dae902e1868ced0384cc
2020-04-22 23:15:06 -07:00
Josh Gao
d5d5ba1644 adbd: don't use libc++_static.
We have dependencies that use libc++_shared, which results in ODR
violation manifesting as host adbd crashing on launch in libc++ locale
initialization.

Test: adbd on host
Change-Id: I6c039b325308fb8c36dfe5c1d090ff4ebe9e3433
2020-04-22 23:15:06 -07:00
Josh Gao
8a9277a243 adb: split transport_local.cpp into client/daemon.
Improve coverage some more.

Test: ./coverage/gen_coverage.sh && ./coverage/report.sh
Change-Id: I014d7ad25b2793d5d836ce5e526d657d46687ea4
2020-04-22 23:15:02 -07:00
Joshua Duong
2e1034fae9 Merge changes from topic "adb-mdns-cmdline" am: 8cab9b6b24 am: d9c0176f1f am: f751d65fdd am: 4489e314e1
Change-Id: I6d6060ffc774cc1c58ea60ce510bd0d8805929c5
2020-04-22 21:16:47 +00:00
Joshua Duong
f751d65fdd Merge changes from topic "adb-mdns-cmdline" am: 8cab9b6b24 am: d9c0176f1f
Change-Id: Ic290b50817b53ba09f24c5aaae9e92605afcedcc
2020-04-22 20:36:12 +00:00
Joshua Duong
13c639e0bb [adb client] Add "mdns services" command.
This command list all discovered mdns services, so we
can connect via service name later on.

Bug: 152521166

Test: 'adb mdns services'
Test: test_adb.py
Change-Id: I23d42a7933e67a65bd0c9924afd6abe5915c0a11
2020-04-22 08:43:15 -07:00
Joshua Duong
504d393176 [adb client] Add "adb mdns check" command.
This command will check if the mdns daemon is available on the host
machine.

Bug: 152510294

Test: pkill -9 mdnsd; adb mdns check; mdnsd; adb mdns check;
Test: test_adb.py
Change-Id: If644678a339763817a8a7adcbdc545626d161aba
2020-04-22 08:43:15 -07:00