Lucas Lin
4c3ce3670c
Merge "Fix NetworkCapabilitiesTest fail on Q device" am: b1bf1f2d36
...
Change-Id: I591b621bb8b659aa7d0c163b20d03952589db428
2020-03-30 08:06:30 +00:00
Chiachang Wang
0ab5158418
Update constructor of NetworkMonitor
...
Remove redundant parameter.
Bug: 152374582
Test: m -j40 ; atest FrameworksNetIntegrationTests
Change-Id: I3a636f0ea5145ac4435e06a9827bb8e01862542d
2020-03-30 07:52:02 +00:00
Lucas Lin
b1bf1f2d36
Merge "Fix NetworkCapabilitiesTest fail on Q device"
2020-03-30 07:41:01 +00:00
Aaron Huang
e59bf917ad
Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e am: a6bdfda91b
...
Change-Id: Iaf17474f9682c46c0a62870fd9f652e554bcf4a6
2020-03-30 06:39:00 +00:00
Aaron Huang
a6bdfda91b
Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e
...
Change-Id: I46148a6d1db0a64006cc1e0d829a0d472a37dda3
2020-03-30 06:25:55 +00:00
Aaron Huang
9d66de5d5e
Merge "Make LinkPropertiesTest compatible with Q"
2020-03-30 06:06:32 +00:00
lucaslin
be8bbacfa2
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
Merged-In: I602ae32dae1ad29fe3293c541fa6d2cef01b81d3
2020-03-30 03:47:00 +00:00
Lucas Lin
b07bc307ac
Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7 am: b98484701c
...
Change-Id: I0bfc89780d632420b0d543addf02e3418a2e6227
2020-03-30 03:26:13 +00:00
Lucas Lin
76de673055
Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f
...
Change-Id: I744c43208f3e13de5ab2b974e64e8a95e7fe640a
2020-03-30 03:26:05 +00:00
Lucas Lin
b98484701c
Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7
...
Change-Id: I189592ddfaa5ad75e0613f8b8468022a3af885c7
2020-03-30 03:15:44 +00:00
Remi NGUYEN VAN
0a55ab853b
Merge "Create a builder for NetworkCapabilities." am: e3aade0a30 am: 8b5ae551f9
...
Change-Id: I2b7646ff87886123230699d306005377858a1c04
2020-03-30 03:15:13 +00:00
Lucas Lin
42cf91c65f
Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4
...
Change-Id: I9bb5c2c32a363d384cbf89b05ea4b2a41217581e
2020-03-30 03:15:06 +00:00
Lucas Lin
28ff516ba7
Merge "Add MatchAllNetworkSpecifierTest"
2020-03-30 03:08:48 +00:00
Lucas Lin
246821b7b4
Merge "Add more tests in LinkPropertiesTests.java"
2020-03-30 03:08:40 +00:00
Remi NGUYEN VAN
8b5ae551f9
Merge "Create a builder for NetworkCapabilities." am: e3aade0a30
...
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
e3aade0a30
Merge "Create a builder for NetworkCapabilities."
2020-03-30 02:58:45 +00:00
Benedict Wong
ec51fecfe6
Make VpnProfile.maxMtu default value match Ikev2VpnProfile
...
This change corrects the VpnProfile's maxMtu defaults to match that of
the Ikev2VpnProfile. 1400 is too high as a default, and Settings will
run into an issue here quite often.
Bug: 152573931
Test: FrameworksNetTests passing
Change-Id: I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c
2020-03-27 11:52:40 -07:00
Mark Chien
2c9ea364d7
Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 0b3d643758 am: d53c48616f
...
Change-Id: I10d2abef918f0f8c6a4fad2297cc4517e10c7d29
2020-03-27 15:59:05 +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
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
9f337c4734
Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 053fb7317e am: 658f6d9465
...
Change-Id: I024e79fc24b8962ff6bd10e4b7c7fc4ad13cbf27
2020-03-27 12:27:58 +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
Aaron Huang
7988471ec9
Make LinkPropertiesTest compatible with Q
...
CompareResult had been moved from LinkProperties to LinkPropertiesUtils
so this change ignores testCompareResult() on Q and only check
compareAllRoutes() works while android version is at least R.
Bug: 151782584
Test: atest CtsNetTestCasesLatestSdk:LinkPropertiesTest
Change-Id: I38b0d83abf983b3bcc01fc6aea2e5cc307734198
2020-03-27 16:41:21 +08:00
Aaron Huang
d376174b86
Merge "API review: access field by method" am: a09a992749 am: d9f35a57b5
...
Change-Id: I60e7f467251e2c33f62967edd1c029321eb6e369
2020-03-27 07:47:32 +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
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
lucaslin
55c6a844fc
Add more tests in LinkPropertiesTests.java
...
Test getAllInterfaceNames(), hasIpv4DefaultRoute(),
hasIpv4DnsServer() and hasIpv6DnsServer().
Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:android.net.LinkPropertiesTest
Change-Id: Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f
2020-03-26 19:15:55 +08:00
lucaslin
5bf0d2de9d
Add MatchAllNetworkSpecifierTest
...
Bug: 139268426
Bug: 135998869
Test: atest CtsNetTestCasesLatestSdk:MatchAllNetworkSpecifierTest
Change-Id: Ib593708d5621ff20e6a0c31e5698b2b658f64d45
2020-03-26 18:58:08 +08:00
Xiao Ma
f6576f9d6f
Merge "Add CTS tests for ApfCapabilities static APIs." am: 854b55854b am: 1b7eddd68e
...
Change-Id: Ib8d64777cd5db1ca5e2870964e4a8f65fa5400ef
2020-03-26 01:36:51 +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
c89cc407ef
Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" am: a982d12943 am: 3870a078e3
...
Change-Id: I3e4b845af64f8e35ba0aa381f43b0e3ca939e6eb
2020-03-25 10:49:54 +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
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
Benedict Wong
047915453c
Merge "Automatically set IPsec tunnel interface as up" am: bc74233e8a am: c629b86519
...
Change-Id: Iea78d37e17961a755194e42a85fe7ab92c20c4fb
2020-03-25 05:01:42 +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
Chalard Jean
542e60001a
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
bc74233e8a
Merge "Automatically set IPsec tunnel interface as up"
2020-03-25 04:18:50 +00:00
Chalard Jean
d45aa3cb78
Merge "Expose netId by adding getter API" am: 461f81faac am: d0484fa1dd
...
Change-Id: I45a3b531454d7555ece5483846047cfdb6aefc17
2020-03-25 02:59:32 +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
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
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
be64d88ab1
Merge "Fix addRoute replace default route unexpectedly" am: 56d39d3251 am: c6a56b7678
...
Change-Id: I62f5226f92948414838b332610262d9f6f395570
2020-03-24 06:15:19 +00:00
Treehugger Robot
c6a56b7678
Merge "Fix addRoute replace default route unexpectedly" am: 56d39d3251
...
Change-Id: I43e953159c33c267a5fd7f6359ed8ee8d683affb
2020-03-24 06:03:10 +00:00