Commit Graph

9002 Commits

Author SHA1 Message Date
Aaron Huang
4d41bca0ca 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
Aaron Huang
1d4b09a9fa 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
3dee54b2e6 Merge "Automatically set IPsec tunnel interface as up" am: 57b8e50ad5 am: da13bf31e9
Change-Id: I01d10d2e1c0fcc52b88901609fae068d6d5268f7
2020-03-25 05:01:20 +00:00
Benedict Wong
da13bf31e9 Merge "Automatically set IPsec tunnel interface as up" am: 57b8e50ad5
Change-Id: I068814590192decaf353cdd8c46cc7f65badc746
2020-03-25 04:35:03 +00:00
Benedict Wong
57b8e50ad5 Merge "Automatically set IPsec tunnel interface as up" 2020-03-25 04:18:50 +00:00
Chalard Jean
cb8b7f5d5b [automerger skipped] Merge "Expose netId by adding getter API" am: cb1c9fcc50 am: 361845839b -s ours
am skip reason: Change-Id Ieb1483c146aa2f7d8f251157e6e81d71c44ae899 with SHA-1 d069cf9367 is in history

Change-Id: Idc9f5dc82a1a155b136d07721400eeabd005832d
2020-03-25 02:59:26 +00:00
Chalard Jean
361845839b Merge "Expose netId by adding getter API" am: cb1c9fcc50
Change-Id: Iab3bae76255fb4096aa3b2c9da8d6f12bb588d3e
2020-03-25 02:44:04 +00:00
Chalard Jean
cb1c9fcc50 Merge "Expose netId by adding getter API" 2020-03-25 02:23:03 +00:00
Lucas Lin
1c0a12fef7 Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev am: b3d186dda8
Change-Id: I7b70c57ab03247a69a9a197429480fcfd2cb0f9f
2020-03-25 02:10:13 +00:00
Lucas Lin
b3d186dda8 Merge "Fix NetworkCapabilitiesTest fail on Q device" into rvc-dev 2020-03-25 02:00:35 +00:00
lucaslin
e0bf23d34f 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
TreeHugger Robot
c0f9fd6e27 [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 21c26dae4e is in history

Change-Id: Iada19e842e8728858517dca1de7a0def0748e157
2020-03-24 10:51:47 +00:00
markchien
dee287219f 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
77a77390cb 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
7ffa5b4ddc Merge "Fix addRoute replace default route unexpectedly" am: 7a1edfc7e6 am: beb47f1d53
Change-Id: I59759bb5241f24f5b0a3359c9c9bdb089b1b9515
2020-03-24 06:15:24 +00:00
Treehugger Robot
beb47f1d53 Merge "Fix addRoute replace default route unexpectedly" am: 7a1edfc7e6
Change-Id: I43e953159c33c267a5fd7f6359ed8ee8d683affb
2020-03-24 06:03:10 +00:00
Treehugger Robot
7a1edfc7e6 Merge "Fix addRoute replace default route unexpectedly" 2020-03-24 05:51:30 +00:00
junyulai
21c26dae4e 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
2020-03-24 10:27:01 +08:00
Tobias Thierer
44d661d7f6 Merge "Refactor Network's use of mUrlConnectionFactory." am: 57de4563f4 am: 14898d7091
Change-Id: I7ce77a1735521cc10ee16a4c6f45e59c0a87585a
2020-03-23 12:08:11 +00:00
Tobias Thierer
14898d7091 Merge "Refactor Network's use of mUrlConnectionFactory." am: 57de4563f4
Change-Id: I3ad8fd8479e91bc34b21297b7953a38372431a8c
2020-03-23 11:52:22 +00:00
Tobias Thierer
57de4563f4 Merge "Refactor Network's use of mUrlConnectionFactory." 2020-03-23 11:34:43 +00:00
Tobias Thierer
d109bbbbe4 Refactor Network's use of mUrlConnectionFactory.
1.) Replace maybeInitUrlConnectionFactory() with a static method
    createUrlConnectionFactory(Dns) and move the logic to acquire
    the lock and initialize mUrlConnectionFactory out into
    openConnection. This makes it a bit clearer that the lock
    is acquired during openConnection().
2.) Use @GuardedBy("mLock") rather than a human readable comment
    on mUrlConnectionFactory.
3.) Make mUrlConnectionFactory non-volatile (since it's guarded by
    mLock), as recommended by Narayan on the review thread for
    http://r.android.com/370652
    Alternatively, the field could have remained volatile
    and we could have used double-checked locking to avoid
    acquiring the lock in the common case.
    The lock is only acquired during getSocketFactory() and
    openConnection(), so it shouldn't usually be contended.

This CL is a pure refactoring that shouldn't have any observable
behavior change.

Bug: 38311512
Test: Treehugger
Exempt-From-Owner-Approval: refactoring only, owner didn't respond in time
Change-Id: I1cf6075dc7cd994657b11d6a82de3ec63235fb1e
2020-03-23 11:34:32 +00:00
Remi NGUYEN VAN
413d8c838b [automerger skipped] Merge changes from topic "netstack_constant_cherrypick" am: 94c93edbaf am: 0630b49126 -s ours
am skip reason: Change-Id I7855090bffbe895c8349ad4903b8f2eb55515f0b with SHA-1 ccea0bb385 is in history

Change-Id: I278c197256ccd394636c8283a5988ad57b5d7bfe
2020-03-23 04:04:40 +00:00
Remi NGUYEN VAN
0630b49126 Merge changes from topic "netstack_constant_cherrypick" am: 94c93edbaf
Change-Id: I4fa3f771fe93e9b6024828d9c725502629c1ccff
2020-03-23 03:48:08 +00:00
Remi NGUYEN VAN
94c93edbaf Merge changes from topic "netstack_constant_cherrypick"
* changes:
  Remove usage of Context.NETWORK_STACK_SERVICE
  Remove NETWORK_STACK_SERVICE constant
2020-03-23 03:33:58 +00:00
Remi NGUYEN VAN
f2fed038c3 Remove usage of Context.NETWORK_STACK_SERVICE
The NetworkStack.getService() API should be used instead.

Bug: 151243982
Test: atest FrameworksNetTests TetheringTests
      Manual tethering test
Merged-In: I7855090bffbe895c8349ad4903b8f2eb55515f0b
(clean cherry-pick from internal branch)

Change-Id: If4af2846a82605e828287a9a4680d5547b76b802
2020-03-23 11:29:06 +09:00
TreeHugger Robot
f284c4e7de [automerger skipped] Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c95a961a0b -s ours
am skip reason: subject contains skip directive

Change-Id: Ia1f95f590e25c34b4bb6dcf91c06f46a1494c523
2020-03-20 18:31:59 +00:00
TreeHugger Robot
c95a961a0b Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master 2020-03-20 18:15:02 +00:00
Aaron Huang
9bfbb60d40 Merge "API review: access field by method" into rvc-dev am: 854250037c
Change-Id: If07f22d62b3fcc341063aaf98130da9c90f7d953
2020-03-20 11:24:32 +00:00
Junyu Lai
bfe619c187 Merge "Create a builder for NetworkCapabilities." into rvc-dev am: 448b243f52
Change-Id: Ia2b117da5d9331d63a9b4814ae8d26dbbdf3275f
2020-03-20 11:23:57 +00:00
Junyu Lai
d7ecebfa74 Merge "Expose netId by adding getter API" into rvc-dev am: 21da2b6432
Change-Id: I826f8a561b2bd0f456302247f90d26ffc42c42df
2020-03-20 11:23:27 +00:00
Aaron Huang
21074c87aa API review: access field by method am: c3e9562525
Change-Id: I5128f2865406e0f35fb30af102dc9957ceac29ed
2020-03-20 11:22:39 +00:00
Aaron Huang
854250037c Merge "API review: access field by method" into rvc-dev 2020-03-20 11:09:43 +00:00
Chalard Jean
d2c09529a9 Create a builder for NetworkCapabilities. am: dfcbc07b3e
Change-Id: I3d7a595d25b65ff4f5762c83a3dfc82c0f5ddc2d
2020-03-20 11:08:52 +00:00
Junyu Lai
448b243f52 Merge "Create a builder for NetworkCapabilities." into rvc-dev 2020-03-20 11:03:47 +00:00
Junyu Lai
21da2b6432 Merge "Expose netId by adding getter API" into rvc-dev 2020-03-20 11:03:05 +00:00
Cody Kesting
5a288ee4d0 [automerger skipped] Merge "Change NetworkCapabilties administrator UIDs to be stored as int[]." am: 3cde0f0c33 am: a0ead5987f -s ours
am skip reason: Change-Id I2652a5b0f276b8944454af5cb4b1383a3e054cfa with SHA-1 1043927267 is in history

Change-Id: Id841d62573000973c6f97d94e583f16b4bf94f53
2020-03-19 18:41:38 +00:00
Cody Kesting
a0ead5987f Merge "Change NetworkCapabilties administrator UIDs to be stored as int[]." am: 3cde0f0c33
Change-Id: I4f0c145c08a1e4fef7badcd6476d4a69808f15c1
2020-03-19 18:23:29 +00:00
Cody Kesting
3cde0f0c33 Merge "Change NetworkCapabilties administrator UIDs to be stored as int[]." 2020-03-19 18:09:26 +00:00
Xin Li
1d4d52c88f DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master
Bug: 151763422
Change-Id: I62d3293f617f630d3d2a3d5f67b764bf272769bf
2020-03-19 10:10:35 -07:00
Mark Chien
39d71ae258 [automerger skipped] Merge "TetheringManager API clean up" am: ffe3a0c6ca am: 20df994471 -s ours
am skip reason: Change-Id Idd041f0fbeca411ea23e49786a50dd7feb77ef45 with SHA-1 68b6784942 is in history

Change-Id: I3b914d7ea26dacf4e7cbebd0494d4c4c0b520c8c
2020-03-19 16:28:38 +00:00
Treehugger Robot
15970917ea [automerger skipped] Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" am: 0497d8bbf3 am: 5dcef6a912 -s ours
am skip reason: Change-Id I87ef1d451eefa6998b9793c4eacabae978376d24 with SHA-1 0fe1140651 is in history

Change-Id: Ie5db8cb976a15fa9f16a8cc76a43f7d9a0ba9761
2020-03-19 16:28:12 +00:00
Mark Chien
20df994471 Merge "TetheringManager API clean up" am: ffe3a0c6ca
Change-Id: I93e9bb5f596fff27de236b56cf21f9edb3c0204a
2020-03-19 16:17:27 +00:00
Treehugger Robot
5dcef6a912 Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" am: 0497d8bbf3
Change-Id: If0000228b44b9f379c6e1499d7d86d7738889ee2
2020-03-19 16:16:58 +00:00
Mark Chien
ffe3a0c6ca Merge "TetheringManager API clean up" 2020-03-19 16:09:21 +00:00
Treehugger Robot
0497d8bbf3 Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" 2020-03-19 15:51:32 +00:00
Lorenzo Colitti
78ff620264 [automerger skipped] Merge "Make Ethernet interfaces more testable." into rvc-dev am: 7f11f2d84f -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 8687436656 is in history

Change-Id: Ibd50e97ac990992af5d9d5ac30cad12f2a28a324
2020-03-19 14:45:06 +00:00
Lorenzo Colitti
94a71998ec [automerger skipped] Make Ethernet interfaces more testable. am: 8687436656 -s ours
am skip reason: Change-Id I86eef7a93267f800dbfc8eafd307effa76a344ca with SHA-1 4c17972cb2 is in history

Change-Id: I3673d68d69670828a6ecb96073a0d9d2c3d7eca1
2020-03-19 14:44:23 +00:00
Lorenzo Colitti
7f11f2d84f Merge "Make Ethernet interfaces more testable." into rvc-dev 2020-03-19 14:31:57 +00:00
TreeHugger Robot
0707fd71bd Merge "Move NetworkCallback to last parameter for new exposed requestNetwork" into rvc-dev am: b6c84e985d
Change-Id: I03fd96ffe141f5cf5c2448390aba5be9c28fc96a
2020-03-19 13:52:20 +00:00