Commit Graph

8299 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
0b05c400a0 Merge "Create a builder for NetworkCapabilities." am: 9259da76fb am: aa3677342f
Change-Id: I2b7646ff87886123230699d306005377858a1c04
2020-03-30 03:15:13 +00:00
Remi NGUYEN VAN
aa3677342f Merge "Create a builder for NetworkCapabilities." am: 9259da76fb
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
9259da76fb Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Mark Chien
1d6507e06e Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: db96b34bf7 am: 10f581540e
Change-Id: I10d2abef918f0f8c6a4fad2297cc4517e10c7d29
2020-03-27 15:59:05 +00:00
Mark Chien
10f581540e Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: db96b34bf7
Change-Id: I30eefa35d19f0a2dd8382fc3f63470d1aeb0dea9
2020-03-27 15:45:06 +00:00
Mark Chien
db96b34bf7 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" 2020-03-27 15:28:09 +00:00
markchien
7fae6eae10 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
52dca1574c Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: d49cc3d8c2 am: f954f47bc8
Change-Id: I024e79fc24b8962ff6bd10e4b7c7fc4ad13cbf27
2020-03-27 12:27:58 +00:00
Daulet Zhanguzin
f954f47bc8 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: d49cc3d8c2
Change-Id: I9f9ba24036e19f568942466c866c7be23112c10a
2020-03-27 12:07:53 +00:00
Daulet Zhanguzin
d49cc3d8c2 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 2020-03-27 11:53:39 +00:00
Aaron Huang
fd8a273000 Merge "API review: access field by method" am: 1c556c813c am: c145a18f79
Change-Id: I60e7f467251e2c33f62967edd1c029321eb6e369
2020-03-27 07:47:32 +00:00
Aaron Huang
c145a18f79 Merge "API review: access field by method" am: 1c556c813c
Change-Id: I68041686393f73a38dcd49f6fcd5bd5930f6054d
2020-03-27 07:24:02 +00:00
Aaron Huang
1c556c813c Merge "API review: access field by method" 2020-03-27 07:03:25 +00:00
Daulet Zhanguzin
08334a14c7 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
1df49c8b6a Merge "Add CTS tests for ApfCapabilities static APIs." am: e1f0d9a0d3 am: 1ff77a4fa2
Change-Id: Ib8d64777cd5db1ca5e2870964e4a8f65fa5400ef
2020-03-26 01:36:51 +00:00
Xiao Ma
1ff77a4fa2 Merge "Add CTS tests for ApfCapabilities static APIs." am: e1f0d9a0d3
Change-Id: I6679b26173339eb6fbb9fa0b08de7f9fb0751148
2020-03-26 01:36:06 +00:00
Xiao Ma
e1f0d9a0d3 Merge "Add CTS tests for ApfCapabilities static APIs." 2020-03-26 01:22:05 +00:00
Chalard Jean
377786b379 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" am: 86b48f950e am: d65c452100
Change-Id: I3e4b845af64f8e35ba0aa381f43b0e3ca939e6eb
2020-03-25 10:49:54 +00:00
Chalard Jean
d65c452100 Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" am: 86b48f950e
Change-Id: Ibd162792a7ab02fcbb06130f21a825a386678c05
2020-03-25 10:33:55 +00:00
Chalard Jean
86b48f950e Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" 2020-03-25 09:47:03 +00:00
Chalard Jean
b5b172f89f 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
Benedict Wong
3fdeb4e59f Merge "Automatically set IPsec tunnel interface as up" am: 57b8e50ad5 am: da13bf31e9
Change-Id: Iea78d37e17961a755194e42a85fe7ab92c20c4fb
2020-03-25 05:01:42 +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
Chalard Jean
bd958b3101 Create a builder for NetworkCapabilities.
Bug: 151322799
Test: FrameworksWifiTests
Change-Id: I69c00c9e3963950e55d7105d8825f7d3a3ec9b2f
Merged-In: I06eb97e50d5583579b3c26d1365d2dbaec8bfc99
(cherry picked from commit 9771f34dae9cdeb857636cac2b3c2d473713914e)
2020-03-25 13:27:04 +09:00
Benedict Wong
57b8e50ad5 Merge "Automatically set IPsec tunnel interface as up" 2020-03-25 04:18:50 +00:00
Chalard Jean
bbb823ac32 Merge "Expose netId by adding getter API" am: cb1c9fcc50 am: 361845839b
Change-Id: I45a3b531454d7555ece5483846047cfdb6aefc17
2020-03-25 02:59:32 +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
Aaron Huang
60011ce0a1 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
Xiao Ma
b0424ef126 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
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
014f855013 Merge "Fix addRoute replace default route unexpectedly" am: 7a1edfc7e6 am: beb47f1d53
Change-Id: I62f5226f92948414838b332610262d9f6f395570
2020-03-24 06:15:19 +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
79ace6a36f Merge "Refactor Network's use of mUrlConnectionFactory." am: 57de4563f4 am: 14898d7091
Change-Id: I9634a6830d2436c3ba105a4ba61aeba4c1c68f06
2020-03-23 12:08:39 +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
cdcad00697 Merge changes from topic "netstack_constant_cherrypick" am: 94c93edbaf am: 0630b49126
Change-Id: I393d8cc8ace27aaeed9ff6cb26bc52551628b8a1
2020-03-23 04:04:33 +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
12621ef0d5 Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master" into stage-aosp-master am: c95a961a0b
Change-Id: I90bb2d5c1feb7f74f3677828454599a7f7bb2e88
2020-03-20 18:33:07 +00:00
Xin Li
859cb502e8 DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 1d4d52c88f
Change-Id: Ief9788fe26220b3f31d99c46a38aa6992e41d56e
2020-03-20 18:32:31 +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
Cody Kesting
11aef2dd0e Merge "Change NetworkCapabilties administrator UIDs to be stored as int[]." am: 3cde0f0c33 am: a0ead5987f
Change-Id: Ice55919cad6bde67e09ff0fc97d10daa392d80f5
2020-03-19 18:41:57 +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