492febbfa2 - platform/packages/modules/Connectivity

commit	492febbfa2d39549c5d7a4e97e10b845098ecbf0	[log] [tgz]
author	Hai Shalom <haishalom@google.com>	Mon Jan 11 18:45:34 2021 -0800
committer	Hai Shalom <haishalom@google.com>	Mon Jan 11 18:45:34 2021 -0800
tree	ec30c0911d60c359307f9e982e841d94013abeb3
parent	e2944491294d325ca308716c0a62a909a8c8595b [diff]

Support for Venue URL and friendly name from Network agent

Extend CaptivePortalData with a member to hold the venue friendly
name. If CaptivePortalData is initialized by both the network
agent and Capport, merge the two objects to include the venue
friendly name and prioritize the venue URL from the network
agent.

Bug: 162783305
Test: atest ConnectivityServiceTest
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest
Test: End-to-end test
Change-Id: I4fdf356be42237c5b6c0ae5bacfd3cec4726861b

core/java/android/net/CaptivePortalData.java[diff]
services/core/java/com/android/server/ConnectivityService.java[diff]
services/core/java/com/android/server/connectivity/NetworkAgentInfo.java[diff]
tests/net/common/java/android/net/CaptivePortalDataTest.kt[diff]
tests/net/java/com/android/server/ConnectivityServiceTest.java[diff]

5 files changed

tree: ec30c0911d60c359307f9e982e841d94013abeb3

core/
services/
tests/
OWNERS