Commit Graph

9462 Commits

Author SHA1 Message Date
Lorenzo Colitti
9da2c8b650 Merge "Added a new capability for temporarily unmetered network." into rvc-dev am: 0edabc5e4e am: 1dbf63da06
Change-Id: I6e4a59ed2d070c9a4c8eadd843baaa891b73e7d6
2020-04-03 05:25:58 +00:00
Lorenzo Colitti
1dbf63da06 Merge "Added a new capability for temporarily unmetered network." into rvc-dev am: 0edabc5e4e
Change-Id: I2954f582524903c542a65439fba05af6cc37aa0f
2020-04-03 05:07:14 +00:00
Jack Yu
71863e9604 Added a new capability for temporarily unmetered network.
Added a new network capability TEMOPORARILY_NOT_METERED to support
the case that a network can temporarily become unmetered. This
allows carriers to deploy unmetered 5G network. When devices
camp on 5G network, this capability will be dynamically added
to the network and will be removed once leaving 5G coverage.

Bug: 153081494
Test: Manual
Change-Id: I10e26cb0852e67f614e7b9c4e49f95e078602e21
2020-04-02 19:28:41 -07:00
Lorenzo Colitti
ccf3a67aa1 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 426ce6ee78 am: 0d904a3b18 am: 5916708919
Change-Id: I78c0f8204c6fd900e946821ad9f29624a8406e45
2020-04-02 15:47:14 +00:00
Lorenzo Colitti
5916708919 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 426ce6ee78 am: 0d904a3b18
Change-Id: I9521b1a243f6907b790888c7a1e32991da05cf33
2020-04-02 15:24:59 +00:00
Lorenzo Colitti
0d904a3b18 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." am: 426ce6ee78
Change-Id: I542f805511fe770c7869b4ba989416c179d28687
2020-04-02 15:06:25 +00:00
Lorenzo Colitti
426ce6ee78 Merge "Rename the *Nat64Prefix to *Nat64PrefixFromDns." 2020-04-02 14:45:11 +00:00
Lorenzo Colitti
d523d1416d Rename the *Nat64Prefix to *Nat64PrefixFromDns.
This just a rename with no functional changes at all. It is
preparation for supporting getting the NAT64 prefix from the
RA.

Bug: 150648313
Test: covered by existing ConnectivityServiceTest and Nat464XlatTest
Change-Id: Ia9a09a708870827b1e4cf068f930fa9542dd116c
2020-04-02 22:48:03 +09:00
Lorenzo Colitti
3f9530b568 [automerger skipped] Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev am: 86ae134de8 -s ours am: 7378b9cc59 -s ours
am skip reason: Change-Id Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f with SHA-1 55c6a844fc is in history

Change-Id: If7f339219052efb617eeaf9f878b01fac5394859
2020-04-02 11:11:17 +00:00
Lorenzo Colitti
652f332c21 [automerger skipped] Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev am: 86ae134de8 am: adcc974e20 -s ours
am skip reason: Change-Id Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f with SHA-1 55c6a844fc is in history

Change-Id: I2790f87a2211ae084cd11f373e94aac3e1eba291
2020-04-02 11:10:37 +00:00
Lorenzo Colitti
adcc974e20 Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev am: 86ae134de8
Change-Id: Icb07eade679f34a7872050ca711aa45ffd11e462
2020-04-02 10:52:46 +00:00
Lorenzo Colitti
7378b9cc59 [automerger skipped] Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev am: 86ae134de8 -s ours
am skip reason: Change-Id Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f with SHA-1 55c6a844fc is in history

Change-Id: Ie4b165c0543676d142fc9dd216e689e2aab18a35
2020-04-02 10:52:17 +00:00
Lorenzo Colitti
86ae134de8 Merge "Add more tests in LinkPropertiesTests.java" into rvc-dev 2020-04-02 10:35:49 +00:00
Chalard Jean
3f3dc53af5 [automerger skipped] Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 9122e56202 am: 0d7aa85f99 -s ours am: 5f6ebed9d7 -s ours
am skip reason: Change-Id I076876a6662bde143ef7d315ce3767acafff93c1 with SHA-1 51b8e287ad is in history

Change-Id: I4562b95900e42d0bb995556e837e096b99d9991e
2020-04-02 07:00:14 +00:00
Chalard Jean
52f6d0bc25 [automerger skipped] Address further API council comments. am: 691a34d96b am: 811833721f -s ours am: 6460bd74fa -s ours
am skip reason: Change-Id I8a785ae0e74e659c317deaaa28c203356c7766ed with SHA-1 812e8cb87e is in history

Change-Id: If9d9cb651cb121fb6620929b589a8c02fbc2cefb
2020-04-02 07:00:10 +00:00
Chalard Jean
5f6ebed9d7 [automerger skipped] Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 9122e56202 am: 0d7aa85f99 -s ours
am skip reason: Change-Id I076876a6662bde143ef7d315ce3767acafff93c1 with SHA-1 51b8e287ad is in history

Change-Id: Ia71fd58217ec6dab128dc83781fb7e42e412472e
2020-04-02 06:37:24 +00:00
Chalard Jean
6460bd74fa [automerger skipped] Address further API council comments. am: 691a34d96b am: 811833721f -s ours
am skip reason: Change-Id I8a785ae0e74e659c317deaaa28c203356c7766ed with SHA-1 812e8cb87e is in history

Change-Id: I0a0cae7327fd84f078e1027840a86b1db090d9c3
2020-04-02 06:37:15 +00:00
Chalard Jean
0d7aa85f99 Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 9122e56202
Change-Id: I1149e5d0c93885d401817d65af02b6ae47f51dfc
2020-04-02 06:15:02 +00:00
Chalard Jean
811833721f Address further API council comments. am: 691a34d96b
Change-Id: I237fc6a82df362d5463e8e518967de28735bf2da
2020-04-02 06:14:55 +00:00
Chalard Jean
9122e56202 Merge changes from topics "api-fix-networkagent", "satisfiedby"
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
2020-04-02 05:51:02 +00:00
Automerger Merge Worker
8da7c53635 Merge "Merge "Only apply VPN isolation if it's fully routed" am: 5c5d1a1282 am: d24e7fb5a1" into rvc-dev-plus-aosp am: 8eec601b70
Change-Id: I5caa0ec3eb4e3a91c2b088ba8094d1bda0e1a23f
2020-04-02 05:13:04 +00:00
Lorenzo Colitti
62d2333abd Merge "Only apply VPN isolation if it's fully routed" am: 5c5d1a1282 am: d24e7fb5a1
Change-Id: I9230f1a73698344eb40ae3e0ebc5d73cc259f2d0
2020-04-02 04:50:41 +00:00
Lorenzo Colitti
d24e7fb5a1 Merge "Only apply VPN isolation if it's fully routed" am: 5c5d1a1282
Change-Id: I5267b567e1b9babe3bc95d2984262dc864681a2d
2020-04-02 04:32:04 +00:00
Lorenzo Colitti
5c5d1a1282 Merge "Only apply VPN isolation if it's fully routed" 2020-04-02 04:10:12 +00:00
Junyu Lai
561fe32643 Merge changes from topic "sp26-networkstats-cts" am: e71d3cf971 am: 8ea70c1969 am: dc7732f258
Change-Id: I0dc9884b3f36ecc6678d741d74e5c85ac0756378
2020-04-02 03:11:17 +00:00
junyulai
53712d099e [SP26.2] add a method in NetworkStats that removes empty entries am: 1052557f33 am: 378271190c am: ca8fafc0f9
Change-Id: Ice87baf7326ad333b611a348b3bceebe71d0858e
2020-04-02 03:11:14 +00:00
Junyu Lai
dc7732f258 Merge changes from topic "sp26-networkstats-cts" am: e71d3cf971 am: 8ea70c1969
Change-Id: I0964b1752acbba767135c960aba12f169b3f852c
2020-04-02 02:40:53 +00:00
junyulai
ca8fafc0f9 [SP26.2] add a method in NetworkStats that removes empty entries am: 1052557f33 am: 378271190c
Change-Id: I388b1d3677d362da2595739913880efa9a643a03
2020-04-02 02:40:42 +00:00
Junyu Lai
8ea70c1969 Merge changes from topic "sp26-networkstats-cts" am: e71d3cf971
Change-Id: I124f0def6fdaad8f1726df23edc87b6aa7856586
2020-04-02 02:21:26 +00:00
junyulai
378271190c [SP26.2] add a method in NetworkStats that removes empty entries am: 1052557f33
Change-Id: Ieee0896672625f3bab9ec02a5efa495a9d1f001b
2020-04-02 02:21:20 +00:00
Junyu Lai
e71d3cf971 Merge changes from topic "sp26-networkstats-cts"
* changes:
  [SP26] add CTS for NetworkStats
  [SP26.2] add a method in NetworkStats that removes empty entries
2020-04-02 02:00:59 +00:00
Chalard Jean
c62f9a53d8 Rename satisfiedBy into canBeSatisfiedBy
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Change-Id: I076876a6662bde143ef7d315ce3767acafff93c1
Merged-In: I076876a6662bde143ef7d315ce3767acafff93c1
2020-04-01 20:38:30 +08:00
Chiachang Wang
c7e9a49d4d [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours am: de56acb0a0 -s ours
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 0ab5158418 is in history

Change-Id: I8ab7bf30792b69ec23cf28a17771ffe243abd162
2020-04-01 09:24:08 +00:00
Chiachang Wang
eda2f43954 [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 am: 3844a61841 -s ours
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 0ab5158418 is in history

Change-Id: I0b4d8e47e8900c0aaf9cee4e95956401e3087b30
2020-04-01 09:23:54 +00:00
Chiachang Wang
de56acb0a0 [automerger skipped] Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9 -s ours
am skip reason: Change-Id I3a636f0ea5145ac4435e06a9827bb8e01862542d with SHA-1 0ab5158418 is in history

Change-Id: I728c5080b92ffa7c8c2524f2430252af1faee963
2020-04-01 09:11:18 +00:00
Chiachang Wang
3844a61841 Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13d9
Change-Id: Iea5f995291bdbe3081c8f7ded5bf4f3f50e6c7d1
2020-04-01 09:11:13 +00:00
junyulai
1052557f33 [SP26.2] add a method in NetworkStats that removes empty entries
In current design, entries with zeros are preserved after
addition/subtraction. These entries are not very useful
and lead to difficulty of verifying the result of
addition/subtraction.

However, change the behavior in the original NetworkStats
is considered risky in current stage.

Thus, this change provide a function that could remove these
empty entries in tests.

Test: atest FrameworksNetTests
Bug: 152827872
Bug: 150644692
Change-Id: I40a76935d55712b8083ee1e17e137a8a4ef5e029
2020-04-01 16:46:08 +08:00
junyulai
e47c7e42e5 [SP26] add CTS for NetworkStats
Test: atest NetworkStatsApiTest
Test: atest CtsNetTestCasesLatestSdk:NetworkStatsApiTest on Q device
Bug: 150644692
Change-Id: I690704b43cfd16de70c4c83916f6d750cf613f67
2020-04-01 16:46:08 +08:00
Rubin Xu
ab8cf306ea Only apply VPN isolation if it's fully routed
VPN is considered fully routed if both IPv4 and IPv6 have
either a default route or a prohibit route.

Bug: 145332510
Test: atest FrameworksNetTests
Change-Id: I59cf48552bca98092d1212e3d718fd420add5458
2020-04-01 09:36:29 +01:00
Chalard Jean
691a34d96b Address further API council comments.
Test: FrameworksNetTests NetworkStackTests
Bug: 152238712
Copy from ag/10866511
Change-Id: I8a785ae0e74e659c317deaaa28c203356c7766ed
Merged-In: I8a785ae0e74e659c317deaaa28c203356c7766ed
2020-04-01 16:01:04 +08:00
Lucas Lin
d5c455815d 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: I2bae76dc93e7aa02efe25dca4b6e99692c79135a
Merged-In: Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f
(cherry picked from commit 30a56a5c719c38894b3dfe803d1b58db26cc1c95)
2020-04-01 06:26:59 +00:00
Aaron Huang
89fc8d8b86 [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: f210e24871 am: 72b40b49e0 -s ours am: 74f8e59f2f -s ours
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 fd23dbbf07 is in history

Change-Id: Ieb1eb1874b6160999da847557dac5e8d4a184e3f
2020-04-01 06:02:52 +00:00
Chalard Jean
3cf79ff728 [automerger skipped] Update NetworkAgentConfig API for council comments am: aea539a13e am: 1b2a71f06d -s ours am: 4c411963c8 -s ours
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 15a3adbdf3 is in history

Change-Id: I3c2a67c8c613fb6a7bc37d004b6c4a3f44cd761c
2020-04-01 06:02:51 +00:00
Chalard Jean
5dd77ec54a [automerger skipped] Update the NetworkAgent API for council comments am: f5d1bfd77f am: 4bc45aba0a -s ours am: f74dd50330 -s ours
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 68d0e42789 is in history

Change-Id: I1c5f6c675417272217a4c15bdae2c8f9f5c35d5a
2020-04-01 06:02:48 +00:00
Aaron Huang
74f8e59f2f [automerger skipped] Merge changes from topics "networkagent_api", "networkprovider_api" am: f210e24871 am: 72b40b49e0 -s ours
am skip reason: Change-Id I6b086572cfc72a0727f4510351cff0e74cbc4302 with SHA-1 fd23dbbf07 is in history

Change-Id: Ic318324c0424d0ad106b0c92c1cb55ba616c6b2b
2020-04-01 05:58:30 +00:00
Chalard Jean
4c411963c8 [automerger skipped] Update NetworkAgentConfig API for council comments am: aea539a13e am: 1b2a71f06d -s ours
am skip reason: Change-Id Idca9f243a5c955f4caa30921ee520e1a93b0d11a with SHA-1 15a3adbdf3 is in history

Change-Id: Icf2ec01fe46cf905b2636d064fd68e2ff9e546e7
2020-04-01 05:58:23 +00:00
Chalard Jean
f74dd50330 [automerger skipped] Update the NetworkAgent API for council comments am: f5d1bfd77f am: 4bc45aba0a -s ours
am skip reason: Change-Id I9a2691f783f4449348c3f767568e05620f0b9df5 with SHA-1 68d0e42789 is in history

Change-Id: Iac85b28ac13c794999110e7cd54f1816dd298967
2020-04-01 05:58:14 +00:00
Aaron Huang
72b40b49e0 Merge changes from topics "networkagent_api", "networkprovider_api" am: f210e24871
Change-Id: I553a53bc4612fc367591738d9669e354730fdacc
2020-04-01 05:47:04 +00:00
Chalard Jean
1b2a71f06d Update NetworkAgentConfig API for council comments am: aea539a13e
Change-Id: I195c50ee1db2dd26b7c06f4ecbd6dbccc38895ef
2020-04-01 05:46:58 +00:00
Chalard Jean
4bc45aba0a Update the NetworkAgent API for council comments am: f5d1bfd77f
Change-Id: I1337011740d2c34f886a6d2975bd3da24f371bb8
2020-04-01 05:46:50 +00:00