Commit graph

80,487 commits

Message SHA1
Revert "Add back getFastPairScanEnabled and setFastPairScanEnabled System API"
This reverts commit 4af0e0f784.

Reason for revert: not support the feature anymore

Test: -m
Change-Id: I26c1f1dd5f36ecb6c1386ccf6ec84118fd93017d

Xinyi Zhou   commited 2023-02-14 20:16:56 +00:00
960d69d821
Merge "Revert "Revert "Remove Fast Pair system APIs."""
Chun Zhang   authored and   Android (Google) Code Review   commited 2023-02-14 20:16:13 +00:00
af90ff2781
Merge "Expose the network binding APIs in AOSP." am: 722a5f2c5e am: ba8da4e99b am: b0422129c3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428875

Change-Id: I180364348c8f4ffd4813ff08b2263f9bb07992b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-14 17:50:01 +00:00
6d88d73480
Merge "Expose the network binding APIs in AOSP." am: 722a5f2c5e am: a0115be6c1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428875

Change-Id: I395ee8b9fafcfef793b269c55f358b3a074701e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-14 16:52:25 +00:00
32af75e1bb
Merge "Expose the network binding APIs in AOSP." am: 722a5f2c5e am: ba8da4e99b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428875

Change-Id: Ie654ed84c7fdd736fe1ab0e0083641b02c887054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-14 16:51:22 +00:00
b0422129c3
Revert "Revert "Remove Fast Pair system APIs.""
This reverts commit f6f8c64989.

Reason for revert: not pass PWG review

Change-Id: Ie6c7536c45d53cc4da31811a19fff6ee23852eef
Bug: 239750900

Chun Zhang   commited 2023-02-14 16:24:37 +00:00
4aad023afb
Merge "Expose the network binding APIs in AOSP." am: 722a5f2c5e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428875

Change-Id: I97165e413c70b29e1f6a57c478fb5cda45388bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-14 16:03:47 +00:00
ba8da4e99b
Merge "Expose the network binding APIs in AOSP." am: 722a5f2c5e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428875

Change-Id: Iefff21712a2f6fee716d96cbdf31267c55673a1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-14 16:02:25 +00:00
a0115be6c1
Merge "Add underpinned Network parameter in SocketKeepalive.start()" am: b7f97fd70e am: e14bd4e654 am: 4a31729d17
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2435292

Change-Id: Ia7c73dfc445ffa593d3584ae6b21ac196fde1bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 15:00:23 +00:00
2789fd5f34
Merge "Expose the network binding APIs in AOSP."
Dan Stahr   authored and   Gerrit Code Review   commited 2023-02-14 14:56:23 +00:00
722a5f2c5e
Merge "Add underpinned Network parameter in SocketKeepalive.start()" am: b7f97fd70e am: 2ccce911ca
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2435292

Change-Id: I5aaf0c77dd32922fecf80829bd7a1fdbfb4cf956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 14:02:09 +00:00
677002ccb5
Merge "Add underpinned Network parameter in SocketKeepalive.start()" am: b7f97fd70e am: e14bd4e654
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2435292

Change-Id: I82a47ea86e9e8fd5031d0c7c80a8b0ac5ba86793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 14:00:47 +00:00
4a31729d17
Merge "Add underpinned Network parameter in SocketKeepalive.start()" am: b7f97fd70e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2435292

Change-Id: I3cde70b1b7614aafa2e9b4d28ca19e0ad60fe60d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 13:13:12 +00:00
e14bd4e654
Merge "Add underpinned Network parameter in SocketKeepalive.start()" am: b7f97fd70e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2435292

Change-Id: I45d21c20d830419c767e0be626d4457a135c61d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 13:11:37 +00:00
2ccce911ca
Merge "Add underpinned Network parameter in SocketKeepalive.start()"
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-02-14 12:35:30 +00:00
b7f97fd70e
Add underpinned Network parameter in SocketKeepalive.start()
Take a Network parameter to have an one-to-one mapping between
keepalive and its underpinned network on the automatic keepalive.

Existing design could not really tell which network should the
automatic keepalive check for the TCP socket status if there are
multiple automatic keepalives enabled, e.g. Bothe IWLAN and VPN
on WiFi enable the automatic keepalive. The keepalive for IWLAN
should check if there are any TCP sockets on the IWLAN network
instead of VPN network.

Bug: 259000745
Test: atest FrameworksNetTests
Test: Cts in the follow up commit
Change-Id: I7353f4ef43e8fdad02c4d4a0bb5f6efa7d94c1b4

chiachangwang   commited 2023-02-14 10:29:19 +00:00
676c84ef98
Merge "TetheringTest: test upstream changes capabilities" am: 79adbb234e am: 7a647a0f29 am: dc9c5ac6fc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2419000

Change-Id: I411b9d1b932cda3879a0523971db9903f1d6ac6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Nucca Chen   authored and   Automerger Merge Worker   commited 2023-02-14 03:42:27 +00:00
ef6b82722c
Merge "[DK5]Add debugging information for automaticOnOff keepalive" am: 2f003081b0 am: 414a8504ac am: faf061f9e4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2379729

Change-Id: I8a8c734368c6fb2fe057993d6dd5bd91802e15a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 03:40:02 +00:00
dfca3523f0
Merge "TetheringTest: test upstream changes capabilities" am: 79adbb234e am: 7a647a0f29
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2419000

Change-Id: Ib730a412c60be30b8f063145179fc21338d6efdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Nucca Chen   authored and   Automerger Merge Worker   commited 2023-02-14 02:48:04 +00:00
dc9c5ac6fc
Merge "[DK5]Add debugging information for automaticOnOff keepalive" am: 2f003081b0 am: 414a8504ac
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2379729

Change-Id: I0b5939c3cb0a5531f79bccefb3b303393e7c9167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 02:47:07 +00:00
faf061f9e4
Merge "TetheringTest: test upstream changes capabilities" am: 79adbb234e am: 32c4ed61c8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2419000

Change-Id: Ic7041a8d3fa4cda730a7a7148f7705a32efb68f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Nucca Chen   authored and   Automerger Merge Worker   commited 2023-02-14 02:43:46 +00:00
aaaf033402
Merge "[DK5]Add debugging information for automaticOnOff keepalive" am: 2f003081b0 am: d0fb21a97b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2379729

Change-Id: I23f48b79ad786497142c55f0ccaa5b42c7b65ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 02:43:28 +00:00
5bb0ef22c0
Merge "TetheringTest: test upstream changes capabilities" am: 79adbb234e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2419000

Change-Id: I7c7cd0da78384b74939af018cabc82baa65865ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Nucca Chen   authored and   Automerger Merge Worker   commited 2023-02-14 02:02:35 +00:00
7a647a0f29
Merge "[DK5]Add debugging information for automaticOnOff keepalive" am: 2f003081b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2379729

Change-Id: Ic2d3b8731ed62c7d30ba6edc08ef60704691ae0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 01:55:00 +00:00
414a8504ac
Merge "TetheringTest: test upstream changes capabilities" am: 79adbb234e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2419000

Change-Id: Id179bb5159dfbf62484885618eb7cdfcb715bc0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Nucca Chen   authored and   Automerger Merge Worker   commited 2023-02-14 01:53:30 +00:00
32c4ed61c8
Merge "[DK5]Add debugging information for automaticOnOff keepalive" am: 2f003081b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2379729

Change-Id: I5d6d25240c2d8d61e09e87bbd8028c09a8d78c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2023-02-14 01:53:03 +00:00
d0fb21a97b
Merge "TetheringTest: test upstream changes capabilities"
Nucca Chen   authored and   Gerrit Code Review   commited 2023-02-14 01:44:56 +00:00
79adbb234e
Merge "[DK5]Add debugging information for automaticOnOff keepalive"
Chiachang Wang   authored and   Gerrit Code Review   commited 2023-02-14 01:06:41 +00:00
2f003081b0
Merge "[API] Add “ERROR_” prefix for consistency with others"
Xinyi Zhou   authored and   Android (Google) Code Review   commited 2023-02-13 23:20:52 +00:00
91bbf39c57
Merge "Always cancel requests during tearDown" am: 42b5c0e197 am: e516839b48 am: 6a201f0393
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2430372

Change-Id: I7bd49476df2b7b82cf851145df98f88d78ef0f84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 23:02:17 +00:00
e8c9d7a637
Merge "Always cancel requests during tearDown" am: 42b5c0e197 am: 25dbbfbc49
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2430372

Change-Id: I84993985ae634fc52a41176931132d91a0f23720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 22:02:26 +00:00
3ef39d2776
Merge "Always cancel requests during tearDown" am: 42b5c0e197 am: e516839b48
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2430372

Change-Id: If897c249342ecc8b0e8c9134bcaf8195ccd9edd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 22:01:40 +00:00
6a201f0393
Merge "Always cancel requests during tearDown" am: 42b5c0e197
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2430372

Change-Id: I19f4dc738291994415108cfc2fbc2c0dba6c4de3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 21:14:11 +00:00
e516839b48
Merge "Always cancel requests during tearDown" am: 42b5c0e197
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2430372

Change-Id: I1dc0a1626d8fe6a215a5ecb51dbef638e8a94bd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 21:13:00 +00:00
25dbbfbc49
Merge "Reflect changes from r.android.com/2426234 in the API surface." am: d2c8818b5b am: 05438dbcbd am: 7d586cd386
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428874

Change-Id: Id6857663cb6b6477633bc3cd86376d6689016088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-13 21:09:05 +00:00
46901de832
Merge "Always cancel requests during tearDown"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-02-13 19:47:51 +00:00
42b5c0e197
Merge "Reflect changes from r.android.com/2426234 in the API surface." am: d2c8818b5b am: ac6f26d9bf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428874

Change-Id: I31e47095bffa1916c438e1e89e933f354f3dab6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-13 19:28:27 +00:00
c78d31ec7a
Merge "Reflect changes from r.android.com/2426234 in the API surface." am: d2c8818b5b am: 05438dbcbd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428874

Change-Id: I104634fef11ffc914d35749fdf069c578f7ee355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-13 19:27:29 +00:00
7d586cd386
Merge "Reflect changes from r.android.com/2426234 in the API surface." am: d2c8818b5b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428874

Change-Id: If6c675ca52d2be88c837ddca2d556c39bf12cf53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-13 18:41:03 +00:00
05438dbcbd
Merge "Reflect changes from r.android.com/2426234 in the API surface." am: d2c8818b5b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2428874

Change-Id: I0e33b1695ab7b5a20ec8f1099478001a2ecb1835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Dan Stahr   authored and   Automerger Merge Worker   commited 2023-02-13 18:39:22 +00:00
ac6f26d9bf
Merge changes Icd871654,I7c70328d am: 1efc2bc73f am: 0908c8a645 am: 95bdfa6cb2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2418999

Change-Id: I478b693c60f1b970ee1e66d8bb7336d2db7431f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 17:43:54 +00:00
d76fe667fa
Merge changes Icd871654,I7c70328d am: 1efc2bc73f am: b69c8bed56
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2418999

Change-Id: Ibc554407cf0434f420972a8a1673818bd908ef53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 17:38:41 +00:00
532e292d23
Merge "Reflect changes from r.android.com/2426234 in the API surface."
Dan Stahr   authored and   Gerrit Code Review   commited 2023-02-13 17:35:04 +00:00
d2c8818b5b
Always cancel requests during tearDown
Assertions can terminate a test prior to that test's blockForDone call.
In this case we will try to shutdown the engine with an outstanding
request, in which case the method will throw, effectively failing the
test.

To avoid that, store a reference by the request created by the test and
always cancel it (before calling engine.shutdown()).

Also, instead of asserting the success of the requests, assume it. This
is required because these tests are not hermetic and the request might
fail due to reasons unrelated to the code being tested.

Bug: 267618889
Test: m && atest CtsNetHttpTestCasess
Change-Id: Ia1e30c99303f05342a2a73562e85d4ab2486c0d7

Stefano Duo   commited 2023-02-13 17:11:26 +00:00
ab552d1080
Merge changes Icd871654,I7c70328d am: 1efc2bc73f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2418999

Change-Id: I9b83ff4a6c1d835b6ac61cfe1289deee5d1a4e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 16:51:03 +00:00
b69c8bed56
Merge changes Icd871654,I7c70328d am: 1efc2bc73f am: 0908c8a645
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2418999

Change-Id: I70d25e5ce7d895ba4fa1d8a276065790d9df8a01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 16:43:30 +00:00
95bdfa6cb2
Merge changes Icd871654,I7c70328d am: 1efc2bc73f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2418999

Change-Id: Iae65e83df04d7a766ac0f14ebdf113855228a441
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2023-02-13 16:01:20 +00:00
0908c8a645
Merge changes Icd871654,I7c70328d
* changes:
  TetheringTest: verify onUpstreamCapabilitiesChanged explicitly
  TetheringTest: demonstrate duplicated upstream change event

Treehugger Robot   authored and   Gerrit Code Review   commited 2023-02-13 15:35:11 +00:00
1efc2bc73f
Reflect changes from r.android.com/2426234 in the API surface.
HttpEngine.getVersion() can be implemented directly as the API and implementation versions don't differ in AOSP.

Test: m
Change-Id: Ide6881f8978cb8890d585f760cd0d1225a4c2542

Dan Stahr   commited 2023-02-13 13:00:17 +00:00
0d2d19a706
[DK5]Add debugging information for automaticOnOff keepalive
Print state and keepalive information in the dump.

Also update ConnectivityService and the corresponding test to
create AutomaticOnOffKeepaliveTracker from a Dependencies class.
ConnectivityService#dump() will require READ_DEVICE_CONFIG
permission because of the new dump() in AutomaticOnOffKeepaliveTreacker.
ConnectivityServiceTest should focus on verifying design in
ConnectivityService, so skipping the DeviceConfig check via a fake
Dependencies class in the unit test.

Sample dump:

AutomaticOnOff enabled: true
  AutomaticOnOffKeepalive [KeepaliveInfo [ type=1 network=100 startedS ... ], state=STATE_ENABLED ]

Bug: 259000745
Test: m ; atest FrameworksNetTests CtsNetTestCases
Change-Id: I9ac725bcef7daec1d1a12bad592b7fa6856a1707

chiachangwang   commited 2023-02-13 09:54:36 +00:00
7c17c283ea