Commit Graph

3189 Commits

Author SHA1 Message Date
Anton Hansson
1df3db2dfc [automerger skipped] Merge "Remove Tethering @TestApi" am: bd175573a5 am: 67f88535d1 am: 96a954a8d6 am: f3b20fff0e -s ours
am skip reason: Change-Id I6e2c8298e90b4b54f0264be974d036fa08cd5632 with SHA-1 f8f8967d0e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460522

Change-Id: Ie918c3443f454be3b481ed4899baee3c126c71b4
2020-10-15 12:40:31 +00:00
Anton Hansson
f3b20fff0e Merge "Remove Tethering @TestApi" am: bd175573a5 am: 67f88535d1 am: 96a954a8d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1460522

Change-Id: I53a8acb3de1550281a6feb15ebfb07c73cef072c
2020-10-15 11:47:59 +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
Anton Hansson
9dfd9a13fc [automerger skipped] Merge "Remove Tethering @TestApi" into mainline-prod am: eccc277066 -s ours
am skip reason: Change-Id I6e2c8298e90b4b54f0264be974d036fa08cd5632 with SHA-1 44b2ebcf34 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12836355

Change-Id: I1431227440105d36d6f6f79e6fadad84bad518d0
2020-10-15 10:53:46 +00:00
Anton Hansson
eccc277066 Merge "Remove Tethering @TestApi" into mainline-prod 2020-10-15 10:05:16 +00:00
Anton Hansson
f8f8967d0e 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-15 07:55:00 +00: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
c46006da45 Merge "Test conflict notification work when using cached address" am: 32456142c0 am: eea93bf6ed am: 70ba3b2c8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459889

Change-Id: Ie80d4d5d535d70df493cad0a80166d779bc6ab77
2020-10-14 14:49:18 +00: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
c8dded9d5f [automerger skipped] Allow tethering pick prefix from all of private address range am: 188bbe712d -s ours
am skip reason: Change-Id Ib6304eb8b4788e9196d0af48e72f00a6bda73a5f with SHA-1 d9acdccbd3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12825260

Change-Id: Ic6adf974d9628e64a5ea41b616df1300d1d9fd0a
2020-10-13 16:29:03 +00: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
6f601a0374 Merge "Allow tethering pick prefix from all of private address range" am: 8c9a2645d8 am: 4388f63021 am: e2a905116c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852

Change-Id: If37b6cdeb9d5573d1a6edc960bfc2a0a7404f73c
2020-10-13 14:30:17 +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
188bbe712d 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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1436852

Change-Id: I008d5e5902a0fb41ac564c73f265e1c942c8dcad
Merged-In: Ib6304eb8b4788e9196d0af48e72f00a6bda73a5f
(cherry picked from commit 0a6b8bfee818734c005d9f131013580f5a23ba21)
2020-10-13 13:48:54 +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
0c083c9e2d Merge "Use IpUtils, NetworkStackConstants in DadProxyTest" am: 80794b2476 am: d7b3661334 am: 371642a328
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440214

Change-Id: Id430f1fd9b0bfa1fff84bee48353b7c49e2b118b
2020-10-13 07:29:52 +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
TreeHugger Robot
353529dcdc [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 1b6030e24c -s ours am: 71572faaf2 -s ours am: 3be56d09db -s ours
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991

Change-Id: I93ca7693005bd26b157fc31c10170e4d2dff5934
2020-10-13 04:50:33 +00:00
TreeHugger Robot
3be56d09db [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 1b6030e24c -s ours am: 71572faaf2 -s ours
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991

Change-Id: Icb052e904d339089be1b2e0014b7dd16f958e3d6
2020-10-13 04:22:42 +00:00
TreeHugger Robot
71572faaf2 [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 1b6030e24c -s ours
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12803991

Change-Id: I35256efaa6acc9a9f28371993587f888c1a77252
2020-10-13 03:51:03 +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
Mark Chien
8ec4998ad9 [automerger skipped] Merge changes I60ed5465,I70b49d0a into mainline-prod am: 0a53121de5 -s ours
am skip reason: Change-Id Iddc5304730dce7b11c5d124b7eddce057d752bbd with SHA-1 a2ffad84c7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12789075

Change-Id: Ia95b27c0ce749a9f7cab5cba532fde873bf44cb0
2020-10-12 10:47:49 +00:00
Mark Chien
0a53121de5 Merge changes I60ed5465,I70b49d0a into mainline-prod
* changes:
  Make the IP subnet persistent till reboot
  Make PrivateAddressCoordinator ignore vpn network
2020-10-12 10:03:26 +00: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
1d0ddf081f Merge "Move IpUtils to frameworks/libs/net" am: 4cb4ef8333 am: 9623f122df am: ff257a083e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234

Change-Id: Ia364eb033d4ed9ae8db4f27fcfd065065581ae73
2020-10-09 01:26:33 +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
9623f122df Merge "Move IpUtils to frameworks/libs/net" am: 4cb4ef8333
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234

Change-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515
2020-10-09 00:30:36 +00:00
Remi NGUYEN VAN
4cb4ef8333 Merge "Move IpUtils to frameworks/libs/net" 2020-10-09 00:13:40 +00:00
Mark Chien
e77e08403c [automerger skipped] Merge "Remove double check interface by NetworkInterface" into mainline-prod am: 9d881ec1ce -s ours
am skip reason: Change-Id Ice8adcce1c4b2c86bd219c701b2afa9ba2339f24 with SHA-1 f609923b4b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12785115

Change-Id: I97d222493d332f73096dc4bc36274039429e252f
2020-10-08 04:28:30 +00:00
Mark Chien
8ce54dcf31 [automerger skipped] Merge "Fix TetheredClient callback fail in InProcessTethering" into mainline-prod am: 19d19662f3 -s ours
am skip reason: Change-Id Ic04e44aef4df772c718ff25ed331bf02f5940c1d with SHA-1 84ec4a397a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12785116

Change-Id: I2b9b03b75c6b41532146a722a8fc4f8677b05729
2020-10-08 04:27:42 +00:00
Mark Chien
9d881ec1ce Merge "Remove double check interface by NetworkInterface" into mainline-prod 2020-10-08 04:17:59 +00:00
Mark Chien
6eacfb6b73 Make the IP subnet persistent till reboot
Make the IP subnet persistent if it do not conflict with upstream.
It allow client to reuse its IP that usually reduce DHCP procedure.

Bug: 168169687
Test: atest TetheringTests
Change-Id: Iddc5304730dce7b11c5d124b7eddce057d752bbd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: I60ed54651034f21ca1cd253d272ac3478881b4e0
Merged-In: Iddc5304730dce7b11c5d124b7eddce057d752bbd
(cherry picked from commit 177e2d8d1867d7e72d00c81d6fbbed756c9f0568)
2020-10-08 00:21:26 +00:00
Treehugger Robot
67c7a7868c Make PrivateAddressCoordinator ignore vpn network
If vpn app make its netmask as 0, PrivateAddressCoordinator
would not able to find suitable address for tethering downstream.
Since tethering do not support vpn as upstream, just ignore vpn
in PrivateAddressCoordinator.

Bug: 166365863
Test: atest TetheringTests
      atest CtsTetheringTest

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413610

Change-Id: I70b49d0a10b80f378dcd2ba78b5bac848e40e5c9
Merged-In: Iabe265467044fea9fa437674ca29ffc7bcdefe3b
(cherry picked from commit a089de8bab)
2020-10-07 17:48:13 +00:00
Treehugger Robot
0afc3ce6a7 Fix TetheredClient callback fail in InProcessTethering
TetheredClient callback would additional check whether caller has
NETWORK_SETTINGS or {MAINLINE_}NETWORK_STACK permission, but it do not
grant for self accessing. InProcessTethering run in system server, so
the services in system server would fail to call TetheredClient callback.
Grant permission for self process.

Bug: 169231588
Test: atest CtsTetheringTest

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1435273

Change-Id: I8faacd26cc6f3e940af3a0147b84b693cb93503c
Merged-In: Ic04e44aef4df772c718ff25ed331bf02f5940c1d
(cherry picked from commit 0c9a370cfc)
2020-10-07 17:46:29 +00:00
Treehugger Robot
b0cbf6f28e Remove double check interface by NetworkInterface
NetworkInterface#getByName can not get the interface without IP addresses.
When setIncludeTestInterfaces(true) is called, the interface will be
placed in client mode, which will delete the link-local address. So calling
NetworkInterface#getByName to get test interface may not work before
switching to server mode.

Bug: 168215721
Test: atest CtsTethering

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440032

Change-Id: Idf1d18261c954e22989774ae97a12261551b31f6
Merged-In: Ice8adcce1c4b2c86bd219c701b2afa9ba2339f24
(cherry picked from commit 155e2a5212)
2020-10-07 17:44:55 +00:00
Mark Chien
7dc14ccfdf Merge "Make the IP subnet persistent till reboot" am: f052e40f79 am: 18b5773041 am: 4b52fef91d am: acbdee3924
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: I8b109e26a043478b9058dbb058b65778259c496d
2020-10-07 11:12:10 +00:00
Mark Chien
acbdee3924 Merge "Make the IP subnet persistent till reboot" am: f052e40f79 am: 18b5773041 am: 4b52fef91d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: I6d76e970384a3021e1fe519a268627628f45d446
2020-10-07 10:56:13 +00:00
Mark Chien
4b52fef91d Merge "Make the IP subnet persistent till reboot" am: f052e40f79 am: 18b5773041
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432958

Change-Id: Ib0d9e5b21b88fd352b06b3064ef3c34de4c046ce
2020-10-07 10:18:00 +00:00