Chalard Jean
7f65953491
Move module utils to the module package.
...
Test: FrameworksWifiTest FrameworksNetTest
Change-Id: Ib04bebb061dc64d6d685116b596fb3179d5b959a
2020-11-05 06:39:05 +00:00
Baligh Uddin
2cceb27a4c
Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 6554b75697 am: 7cb46422b1 am: b94226a63c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12991879
Change-Id: I77f4b9f2b6f71b3be982639369bf292d614e1e1f
2020-11-05 05:04:14 +00:00
Baligh Uddin
7cb46422b1
Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 6554b75697
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12991879
Change-Id: I8bffe476b7aa462e43238d9df182280976b79712
2020-11-05 04:08:28 +00:00
Baligh Uddin
6554b75697
Revert "Add OWNERS block to prevent the tree from mooving during migration."
...
Migration of frameworks/base/packages/Tethering is complete, removing
the OWNERS block.
This reverts commit 1623eb61d5 .
BUG: 167962976
Test: TH
Change-Id: Ic89c084604788b4d41cf854e5015c8ce7791c64d
2020-11-05 03:16:29 +00:00
Baligh Uddin
5329d7ef43
Add visibility rules for cts migration am: 661ae3923d am: c2ca22b5a9 am: 4a74a0788b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984519
Change-Id: Ifeda005dab54b3f5ec2ee1466e3b5ffc26407e1a
2020-11-04 10:30:39 +00:00
Baligh Uddin
c2ca22b5a9
Add visibility rules for cts migration am: 661ae3923d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984519
Change-Id: Ia8a1b074496bd7c5b4c127fe8dc476d54f63d414
2020-11-04 10:06:12 +00:00
Baligh Uddin
661ae3923d
Add visibility rules for cts migration
...
BUG: 167962976
Test: TH
Change-Id: I96b34517e164789c9fa3b8fd7fb33fdd7a2a9166
2020-11-04 05:59:46 +00:00
Nikita Ioffe
bee20e84f8
com.android.tethering: set min_sdk_version 30
...
Tethering is updatable apex module that was launched in R, hence it and
all it dependencies should specify min_sdk_version <= 30.
Test: m
Bug: 171668006
Bug: 171330443
Change-Id: Ic91cf96dda6419d1038b0329b920f9cd24482aef
Exempt-From-Owner-Approval: Mark is owner and gave +2
2020-11-02 21:50:47 +00:00
Treehugger Robot
334cc909c5
Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc am: 5942721506 am: 617dffdbdc am: 3a8e238aa8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478840
Change-Id: I476629002e075d01c83f77be8343157dbd66ce9b
2020-10-29 08:48:24 +00:00
Treehugger Robot
617dffdbdc
Merge changes from topic "bug_167962976_visibility" am: 39c6068cbc am: 5942721506
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1478840
Change-Id: I39d4edd4511d1677af0415d57123f88e5705c3dc
2020-10-29 07:47:45 +00:00
Baligh Uddin
1623eb61d5
Add OWNERS block to prevent the tree from mooving during migration.
...
BUG: 167962976
TEST: None.
Change-Id: I49db5a11ee89645dac158ec3757180b2387e2d70
2020-10-29 03:24:01 +00:00
Baligh Uddin
f814b9b1ce
Add visibility rules for packages/modules/Connectivity/Tethering
...
BUG: 167962976
Test: TH
Change-Id: Id28881b35cf24fc9517fa11af6d8e539ab244fa6
2020-10-29 02:11:55 +00:00
Amit Mahajan
454660e05a
Get rid of telephony-stubs.
...
It was added for telephony mainline and is currently not needed.
Test: basic telephony validity, TH
Bug: 170906882
Change-Id: Idbd05aeef055291fc50008129c30c4ae272c1ac0
2020-10-28 02:36:43 +00:00
Treehugger Robot
acb4e9fc59
Merge "Add shared jarjar rule for tethering tests" am: d75774dfe0 am: 2dc283eeca am: bdca380803 am: 6e654cd7cd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473223
Change-Id: I24795bc612d7956ea8f2776c90810ea5c5eca39e
2020-10-26 13:22:26 +00:00
Treehugger Robot
bdca380803
Merge "Add shared jarjar rule for tethering tests" am: d75774dfe0 am: 2dc283eeca
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1473223
Change-Id: I34c41fbbe5f034a2ed332c784ab0decb2c6b2add
2020-10-26 12:40:34 +00:00
markchien
e3126480ba
Add shared jarjar rule for tethering tests
...
Also jarjar com.android.net.module.util* to
com.android.networkstack.tethering.util*.
Bug: 171670016
Test: atest TetheringCoverageTests
Change-Id: I3bde9ad3c41adf36da99bd944303d88ce992201c
2020-10-26 18:20:25 +08:00
Mark Chien
ae83d10c32
Merge "Bump Tethering apex version code" into rvc-d1-dev-plus-aosp am: 491463a35f am: b68c8bf414
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12890938
Change-Id: I9bf34252d723acb513935596e93ab8d748187041
2020-10-23 04:13:50 +00:00
markchien
0582605da7
Bump Tethering apex version code
...
The version code in the manifest is only used for development
builds, as release builds dynamically replace it.
Bug: 170183552
Test: m
Change-Id: I51916756f41672d372e3a4adce3a8edf5d472c0d
2020-10-22 06:49:24 +00:00
Mark Chien
d1c31a2c11
Merge "Add the flag and default enable selectAllPrefixRange" am: 02fe8ac161 am: d11a25eb56 am: a1468b6591 am: c43f48d6cb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461742
Change-Id: I232a3a52daeed69230215f3be135881415dbdb5c
2020-10-19 13:33:30 +00:00
Mark Chien
a1468b6591
Merge "Add the flag and default enable selectAllPrefixRange" am: 02fe8ac161 am: d11a25eb56
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461742
Change-Id: Ic540b8b0c562a730d4da307aa6890226099e9b46
2020-10-19 13:04:37 +00:00
Mark Chien
d11a25eb56
Merge "Add the flag and default enable selectAllPrefixRange" am: 02fe8ac161
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461742
Change-Id: I6055ea6ac737bb94bd9bc8c8642e86222f1e1d1a
2020-10-19 12:46:44 +00:00
markchien
4607c5535b
Add the flag and default enable selectAllPrefixRange
...
Also add MtsTetheringTest which only run if tethering mainline
module is installed.
Bug: 166057846
Bug: 170265597
Test: atest TetheringTests
Change-Id: I434dda81eb5fab700d873a8ff3429b4222f0c7e6
2020-10-19 16:50:29 +08:00
Mark Chien
3910988c18
Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator" am: 8565b0244a am: a5b9e4a1b4 am: 7c1badf9b0 am: 0854becd64
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459887
Change-Id: I9262e13e3f3919c2b36bb8765a09c4abf2e31aa4
2020-10-15 14:20:00 +00:00
Mark Chien
7c1badf9b0
Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator" am: 8565b0244a am: a5b9e4a1b4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459887
Change-Id: I33842982a1a94a37d2e8b7aa78f5bc9b6e86326e
2020-10-15 13:16:01 +00:00
Mark Chien
a5b9e4a1b4
Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator" am: 8565b0244a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459887
Change-Id: I2874508c560cc31f99e88c02fd63995f62f86a2f
2020-10-15 12:46:39 +00:00
Mark Chien
8565b0244a
Merge "Fix miss tracking downstream problem in PrivateAddressCoordinator"
2020-10-15 12:07:19 +00:00
Anton Hansson
96a954a8d6
Merge "Remove Tethering @TestApi" am: bd175573a5 am: 67f88535d1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460522
Change-Id: I6d44cc10ae75426e715c95540f64e788b506f83b
2020-10-15 11:29:19 +00:00
Anton Hansson
67f88535d1
Merge "Remove Tethering @TestApi" am: bd175573a5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460522
Change-Id: I3dcf776384d6c53876acaeb344820a88c19027da
2020-10-15 11:11:02 +00:00
markchien
634f0a8ec1
Fix miss tracking downstream problem in PrivateAddressCoordinator
...
The downstream do not be tracked if PrivateAddressCoordinator just
return cached address. Then, PrivateAddressCoordinator would not notify
that downstream if conflict happen.
Also remove the null check in getDownstreamPrefix because:
- An IpServer is only added to mDownstreams by requestDownstreamAddress.
- That method will only add the IpServer to mDownstreams if it has an
IPv4 address.
- As soon as that method returns, the IpServer sets mIpv4Address to the
address that was returned.
- When an IpServer is torn down, mIpv4Address is set to null after
releaseDownstream is called.
So it should never be possible for this to return null.
Bug: 168169687
Test: atest CtsTetheringTest
atest TetheringTests
Change-Id: Ide5206b013acdc499344e1c839a830c5b245af41
2020-10-15 16:21:12 +08:00
Anton Hansson
b66b46f933
Merge "Remove Tethering @TestApi"
2020-10-15 07:43:03 +00:00
Anton Hansson
44b2ebcf34
Remove Tethering @TestApi
...
Modules shouldn't have TestApis, as documented in go/android-api-types.
Additionally, nothing depends on these TestApis existing.
Bug: 170395679
Test: m checkapi
Exempt-From-Owner-Approval: cherry-pick
Change-Id: I6e2c8298e90b4b54f0264be974d036fa08cd5632
2020-10-15 07:42:41 +00:00
Treehugger Robot
58a7a933ba
Merge "Test conflict notification work when using cached address" am: 32456142c0 am: eea93bf6ed am: 70ba3b2c8b am: c46006da45
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459889
Change-Id: I237e8e8c4b83d12be2dfce30919dc71b3c16656c
2020-10-14 15:14:05 +00:00
Anton Hansson
87b8363cb9
Remove Tethering @TestApi
...
Modules shouldn't have TestApis, as documented in go/android-api-types.
Additionally, nothing depends on these TestApis existing.
Bug: 170395679
Test: m checkapi
Change-Id: I6e2c8298e90b4b54f0264be974d036fa08cd5632
Merged-In: I6e2c8298e90b4b54f0264be974d036fa08cd5632
2020-10-14 16:03:57 +01:00
Treehugger Robot
70ba3b2c8b
Merge "Test conflict notification work when using cached address" am: 32456142c0 am: eea93bf6ed
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459889
Change-Id: I3f7f1fe42ed92147e5809d48ae5f38745fd71689
2020-10-14 14:34:43 +00:00
Treehugger Robot
eea93bf6ed
Merge "Test conflict notification work when using cached address" am: 32456142c0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459889
Change-Id: Ib9be992d5728346f063cea6ebc67b11a209e04c4
2020-10-14 13:34:06 +00:00
Treehugger Robot
32456142c0
Merge "Test conflict notification work when using cached address"
2020-10-14 13:18:58 +00:00
markchien
ccf07b1dd6
Test conflict notification work when using cached address
...
This test catch the regression introduced in r.android.com/1432958.
Bug: 1432958
Test: atest TetheringTest
Change-Id: Id0c1afb5563954ffee1f598a3a5de6a245d77a0e
2020-10-14 17:02:29 +08:00
Mark Chien
2833425097
Merge "Allow tethering pick prefix from all of private address range" am: 8c9a2645d8 am: 4388f63021 am: e2a905116c am: 6f601a0374
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852
Change-Id: I849f7d336fd4bc7d39d8b268620bcb25dbd26667
2020-10-13 14:58:33 +00:00
Mark Chien
e2a905116c
Merge "Allow tethering pick prefix from all of private address range" am: 8c9a2645d8 am: 4388f63021
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852
Change-Id: Ie44f3b2ebfa51d2c915bd794b6ea0fade0098ecf
2020-10-13 14:01:47 +00:00
Mark Chien
4388f63021
Merge "Allow tethering pick prefix from all of private address range" am: 8c9a2645d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852
Change-Id: Ief2520cd30059542ae3786a36b92198af6739a2a
2020-10-13 13:42:20 +00:00
Mark Chien
8c9a2645d8
Merge "Allow tethering pick prefix from all of private address range"
2020-10-13 13:12:58 +00:00
markchien
d9acdccbd3
Allow tethering pick prefix from all of private address range
...
Currently tethering only pick prefix from 192.168.0.0/16. There is no
aviable tethering address if the upstream address is 192.168.x.y/16.
This change allow tethering to pick prefix from any private address
rnages. Now it still pick from 192.168.0.0/16 only to avoid behavior
change. Will have follow up commit to change the configuration.
Bug: 166057846
Bug: 170265597
Test: atest TetheringTests
atest CtsTetheringTest
Change-Id: Ib6304eb8b4788e9196d0af48e72f00a6bda73a5f
2020-10-13 16:45:09 +08:00
Remi NGUYEN VAN
cf093a8815
Merge "Use IpUtils, NetworkStackConstants in DadProxyTest" am: 80794b2476 am: d7b3661334 am: 371642a328 am: 0c083c9e2d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440214
Change-Id: I4a078231e0145973c413f8dcb127275987eec8de
2020-10-13 07:55:20 +00:00
Remi NGUYEN VAN
371642a328
Merge "Use IpUtils, NetworkStackConstants in DadProxyTest" am: 80794b2476 am: d7b3661334
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440214
Change-Id: I2eb8131309f397a832b16002f7eff702e78dba80
2020-10-13 07:12:10 +00:00
Remi NGUYEN VAN
d7b3661334
Merge "Use IpUtils, NetworkStackConstants in DadProxyTest" am: 80794b2476
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440214
Change-Id: I2e8d55b7984bccbd5959b7b00fa8c8b24acdb67c
2020-10-13 06:31:32 +00:00
Remi NGUYEN VAN
71b9e93a83
Use IpUtils, NetworkStackConstants in DadProxyTest
...
The test had TODOs to address to use IpUtils and NetworkStackConstants
classes once they were moved to frameworks/libs/net. This is now done,
so using the new classes.
Bug: 158042941
Test: atest TetheringPrivilegedTests
Change-Id: I536b4506dbc3b42547ba9cb4e7c3c7a3e9459dd1
2020-10-13 11:30:03 +09:00
Xin Li
51ca8f56c5
Merge ab/6749736 in stage.
...
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Remi NGUYEN VAN
aa448a3514
Merge "Move IpUtils to frameworks/libs/net" am: 4cb4ef8333 am: 9623f122df am: ff257a083e am: 1d0ddf081f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: I27072c126ee7eedc2de3d1cdccd0fd503f1577a1
2020-10-09 01:58:35 +00:00
Remi NGUYEN VAN
ff257a083e
Merge "Move IpUtils to frameworks/libs/net" am: 4cb4ef8333 am: 9623f122df
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234
Change-Id: I03872655d1ef3a7bb436666196ed67bd61601f65
2020-10-09 00:52:31 +00:00
Remi NGUYEN VAN
4cb4ef8333
Merge "Move IpUtils to frameworks/libs/net"
2020-10-09 00:13:40 +00:00