Commit Graph

9039 Commits

Author SHA1 Message Date
Chalard Jean
ec85550d64 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: 199c91b659
Change-Id: I041fa5232ac2f653f0ff9070b9bcd924345f9987
2020-03-27 22:56:26 +00:00
Chalard Jean
199c91b659 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
  Update the NetworkProvider API for council comments
2020-03-27 22:50:42 +00:00
Cody Kesting
fec7877661 [automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: 26177212ed -s ours
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 807ce6621b is in history

Change-Id: I2e8071232c2a866f1c6540cb2d43988d30a4ee65
2020-03-27 19:22:07 +00:00
Cody Kesting
26177212ed Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev 2020-03-27 19:09:00 +00:00
Cody Kesting
3f3c426c35 [automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 5657f9c83c -s ours
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 d759ac61ee is in history

Change-Id: I2a85d7ddc2fc3e6594e19591b589014d65b8b6f7
2020-03-27 18:35:43 +00:00
Cody Kesting
5657f9c83c Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev 2020-03-27 18:22:20 +00:00
Mark Chien
a47b4aca38 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 0b3d643758 am: d53c48616f
Change-Id: Ifedc9c8825550bc5ec5c32c46d0cd0f48d016b5e
2020-03-27 15:58:49 +00:00
Mark Chien
d53c48616f Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 0b3d643758
Change-Id: I30eefa35d19f0a2dd8382fc3f63470d1aeb0dea9
2020-03-27 15:45:06 +00:00
Mark Chien
0b3d643758 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" 2020-03-27 15:28:09 +00:00
Chalard Jean
51b8e287ad Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
2020-03-27 23:46:30 +09:00
markchien
9eb9399321 Unbreak testStartUsingNetworkFeature_enableHipri failure
aosp/1261619 break legacy API that only supported for SDK which is
smaller than android M, caller need to have network stack permission
to request network with legacy type. Fix failure by whitelist permission
check for the caller who built with oder SDK(< M).

Bug: 152229492
Test: atest CtsTetheringTest
      atest ConnectivityManagerLegacyTest# \
      testStartUsingNetworkFeature_enableHipri

Change-Id: I367dff0429f26f266282300edc38637b55eece38
2020-03-27 14:15:13 +00:00
Daulet Zhanguzin
c548c90e1a [automerger skipped] Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 053fb7317e am: 658f6d9465 -s ours
am skip reason: Change-Id Idb1b6ba41af3b52f3376b1157259af3c30328c4e with SHA-1 d4e7dd113d is in history

Change-Id: Ib70273007ee56039d0645f33f59c677ea5f7b1aa
2020-03-27 12:28:12 +00:00
Daulet Zhanguzin
658f6d9465 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 053fb7317e
Change-Id: I9f9ba24036e19f568942466c866c7be23112c10a
2020-03-27 12:07:53 +00:00
Daulet Zhanguzin
053fb7317e Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 2020-03-27 11:53:39 +00:00
Chalard Jean
812e8cb87e Address further API council comments.
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I8a785ae0e74e659c317deaaa28c203356c7766ed
2020-03-27 17:57:24 +09:00
Chalard Jean
fd23dbbf07 Update the NetworkProvider API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Change-Id: I6b086572cfc72a0727f4510351cff0e74cbc4302
2020-03-27 17:53:05 +09:00
Aaron Huang
6e8047057d [automerger skipped] Merge "API review: access field by method" am: a09a992749 am: d9f35a57b5 -s ours
am skip reason: Change-Id Id01e6135193716cc21bba11da529bf1507a954f7 with SHA-1 410236b92e is in history

Change-Id: I495064712b7d8fca42aa78a153eddfbf28d3b64e
2020-03-27 07:46:51 +00:00
Aaron Huang
d9f35a57b5 Merge "API review: access field by method" am: a09a992749
Change-Id: I68041686393f73a38dcd49f6fcd5bd5930f6054d
2020-03-27 07:24:02 +00:00
Aaron Huang
a09a992749 Merge "API review: access field by method" 2020-03-27 07:03:25 +00:00
Chalard Jean
58603f3a63 Merge changes from topic "networkagent_api" into rvc-dev am: f79df94011
Change-Id: If16fd956e2d694fa36492cc1a1512a9d12dee3dd
2020-03-27 06:23:56 +00:00
Chalard Jean
f79df94011 Merge changes from topic "networkagent_api" into rvc-dev
* changes:
  Update NetworkAgentConfig API for council comments
  Update the NetworkAgent API for council comments
2020-03-27 06:20:37 +00:00
Daulet Zhanguzin
ee67425c05 Replace com.android.internal.util.Preconditions.checkNotNull with
java.util.Objects.requireNonNull

Bug: 126528330
Bug: 149348618

Test: Treehugger
Change-Id: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
Merged-In: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
2020-03-26 12:44:56 +00:00
Xiao Ma
07a17aaa51 Merge "Add CTS tests for ApfCapabilities static APIs." am: 854b55854b am: 1b7eddd68e
Change-Id: I11555934df4b27cbb6b7ddbb81022d8fb7c25e15
2020-03-26 01:36:53 +00:00
Xiao Ma
1b7eddd68e Merge "Add CTS tests for ApfCapabilities static APIs." am: 854b55854b
Change-Id: I6679b26173339eb6fbb9fa0b08de7f9fb0751148
2020-03-26 01:36:06 +00:00
Xiao Ma
854b55854b Merge "Add CTS tests for ApfCapabilities static APIs." 2020-03-26 01:22:05 +00:00
Chalard Jean
15a3adbdf3 Update NetworkAgentConfig API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Change-Id: Idca9f243a5c955f4caa30921ee520e1a93b0d11a
2020-03-25 22:43:13 +09:00
Chalard Jean
68d0e42789 Update the NetworkAgent API for council comments
Bug: 152238712
Test: FrameworksNetTests NetworkStackTests
Change-Id: I9a2691f783f4449348c3f767568e05620f0b9df5
2020-03-25 22:35:41 +09:00
Chalard Jean
6b1b2888f3 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" into rvc-dev am: 09b1ee6077
Change-Id: Ic896aa36b6819bcc297ce53ba8f1345ba4b6a9e4
2020-03-25 13:19:22 +00:00
Chalard Jean
abd9a140a6 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" am: a982d12943 am: 3870a078e3
Change-Id: Ia0f76216636ae11d1d9cbea5ed6ff0ee4e2a3f5b
2020-03-25 10:49:54 +00:00
Chalard Jean
d22cb127b9 Allow MANAGE_TEST_NETWORKS to register limited agents
This puts in force some restrictions against test networks,
and in exchange relaxes the restrictions around registering
a network agent that provides a test network.
Test networks can only ever have transport TEST, and have
only a few capabilities available to them.

This is useful in particular to test CTS. See aosp/1253423
for first, basic usage of this capability.

Test: IpSecManagerTunnelTest
Test: new CTS aosp/1253423
Bug: 139268426

Change-Id: Ibd162792a7ab02fcbb06130f21a825a386678c05
(cherry picked from commit 2c129e97cca2234ee6dd079a9c07df0c530d8b36)
2020-03-25 10:43:26 +00:00
Chalard Jean
3870a078e3 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" am: a982d12943
Change-Id: Ibd162792a7ab02fcbb06130f21a825a386678c05
2020-03-25 10:33:55 +00:00
Aaron Huang
df68f4f75e Merge "API review: make exception class and Builder final" into rvc-dev am: 9c9366b2df
Change-Id: I974be68ce205a701619a71e9ef7f43d8f8be0f8c
2020-03-25 09:47:47 +00:00
Chalard Jean
a982d12943 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" 2020-03-25 09:47:03 +00:00
Chalard Jean
5b63976366 Allow MANAGE_TEST_NETWORKS to register limited agents
This puts in force some restrictions against test networks,
and in exchange relaxes the restrictions around registering
a network agent that provides a test network.
Test networks can only ever have transport TEST, and have
only a few capabilities available to them.

This is useful in particular to test CTS. See aosp/1253423
for first, basic usage of this capability.

Test: IpSecManagerTunnelTest
Test: new CTS aosp/1253423
Bug: 139268426
Change-Id: I47600e6097e8519e50ae771daa13bb6bb7640451
2020-03-25 16:28:50 +09:00
Aaron Huang
4b1aada0aa API review: make exception class and Builder final
- InvalidPacketException exception class should be final
- NetworkCapabilities.Builder should be final

Bug: 152203926
Test: atest FrameworksNetTests
Change-Id: If9b799151aff6d41c9bcd8bb86c65a58e46bad73
2020-03-25 13:36:38 +08:00
Benedict Wong
c44d6c9e22 Merge "Automatically set IPsec tunnel interface as up" am: bc74233e8a am: c629b86519
Change-Id: I01d10d2e1c0fcc52b88901609fae068d6d5268f7
2020-03-25 05:01:20 +00:00
Benedict Wong
c629b86519 Merge "Automatically set IPsec tunnel interface as up" am: bc74233e8a
Change-Id: I068814590192decaf353cdd8c46cc7f65badc746
2020-03-25 04:35:03 +00:00
Benedict Wong
bc74233e8a Merge "Automatically set IPsec tunnel interface as up" 2020-03-25 04:18:50 +00:00
Chalard Jean
63e41dd5b1 [automerger skipped] Merge "Expose netId by adding getter API" am: 461f81faac am: d0484fa1dd -s ours
am skip reason: Change-Id Ieb1483c146aa2f7d8f251157e6e81d71c44ae899 with SHA-1 ed55c7ad03 is in history

Change-Id: Idc9f5dc82a1a155b136d07721400eeabd005832d
2020-03-25 02:59:26 +00:00
Chalard Jean
d0484fa1dd Merge "Expose netId by adding getter API" am: 461f81faac
Change-Id: Iab3bae76255fb4096aa3b2c9da8d6f12bb588d3e
2020-03-25 02:44:04 +00:00
Chalard Jean
461f81faac Merge "Expose netId by adding getter API" 2020-03-25 02:23:03 +00:00
Lucas Lin
794c4c2ea0 Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev am: 1aff262943
Change-Id: I7b70c57ab03247a69a9a197429480fcfd2cb0f9f
2020-03-25 02:10:13 +00:00
Lucas Lin
1aff262943 Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev 2020-03-25 02:00:35 +00:00
lucaslin
88cef1a242 Fix NetworkCapabilitiesTest fail on Q device
The getSSID() has changed to getSsid() in Android R, adding
isAtLeastR() to prevent NetworkCapabilitiesTest fail on Android
Q.

Bug: 151322799
Test: Run "atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest"
      on Android Q & R device.
Change-Id: I602ae32dae1ad29fe3293c541fa6d2cef01b81d3
2020-03-24 19:00:09 +08:00
Aaron Huang
005f9d10ae API review: access field by method
- InvalidPacketException, public field should be a method so
  add getter to get error code.
- KeepalivePacketData, public fields should be methods so
   add getter for fields.

Bug: 151322799
Test: atest FrameworksNetTests
      atest FrameworksWifiTests
      atest FrameworksTelephonyTests: some failure in CarrierAppUtilsTest
Copy from ag/10731108
Change-Id: Id01e6135193716cc21bba11da529bf1507a954f7
Merged-In: Id01e6135193716cc21bba11da529bf1507a954f7
2020-03-24 10:55:18 +00:00
TreeHugger Robot
f03a6d289f [automerger skipped] Merge "Fix addRoute replace default route unexpectedly" into rvc-dev am: 887941cbc8 -s ours
am skip reason: Change-Id I7153ec9866f14a109ba8155c905e5d9e4f85eb64 with SHA-1 a1493a52d0 is in history

Change-Id: Iada19e842e8728858517dca1de7a0def0748e157
2020-03-24 10:51:47 +00:00
Xiao Ma
2772ddd5bd Add CTS tests for ApfCapabilities static APIs.
Add tests for getApfEtherTypeBlackList and getApfDrop8023Frames APIs.

Bug: 150640397
Test: atest CtsNetTestCasesLatestSdk:android.net.apf.ApfCapabilitiesTest
      on both of Q and R devices.
Change-Id: I06c5d84d7025420a1e45a953c8c7a5cc3c452e24
2020-03-24 19:38:21 +09:00
markchien
9d26f92289 Expose netId by adding getter API
Bug: 151156820
Test: m
      atest TetetheringTests

Clean CP from ag/10747732

Change-Id: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
Merged-In: Ieb1483c146aa2f7d8f251157e6e81d71c44ae899
2020-03-24 09:19:26 +00:00
Treehugger Robot
cbd7b6b1dd Fix addRoute replace default route unexpectedly
In aosp/1203789, if two routes are with the same destination,
it will be replaced instead of added when calling addRoute.
This breaks scenarios which rely on the ability to add multiple
default routes, such as multiple IPv6 default routes learned
via address autoconfiguration.

This change treats the route is an update if the destination
and nexthop are the same, but different in other properties.

Test: atest OffloadControllerTest#testSetUpstreamLinkPropertiesWorking
Test: atest LinkPropertiesUtilsTest#testLinkPropertiesIdenticalEqual
Test: atest ConnectivityServiceTest#testStackedLinkProperties
Test: atest ConnectivityServiceTest#testRouteAddDeleteUpdate
  (only directly related tests are listed)
Fix: 152170074
Fix: 151911339
Bug: 142892223

Change-Id: I7153ec9866f14a109ba8155c905e5d9e4f85eb64
Merged-In: I7153ec9866f14a109ba8155c905e5d9e4f85eb64
(cherry picked from commit 11aa9cb44aee289329b306cfc51a73cfe1456b61)
2020-03-24 08:41:44 +00:00
Treehugger Robot
c73de276e3 Merge "Fix addRoute replace default route unexpectedly" am: 56d39d3251 am: c6a56b7678
Change-Id: I59759bb5241f24f5b0a3359c9c9bdb089b1b9515
2020-03-24 06:15:24 +00:00