summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/Program.java
diff options
context:
space:
mode:
authorHai Shalom <haishalom@google.com>2021-01-11 18:45:34 -0800
committerHai Shalom <haishalom@google.com>2021-01-11 18:45:34 -0800
commitef5f5b1ea73772524f390b6b7cff07a725fb97af (patch)
treea4e829a393e98525e5f8a86dfb28550325dcc42d /rs/java/android/renderscript/Program.java
parent469e5b33177a7d252c7e74a4112ade3de95f11c9 (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
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions