Commit Graph

125 Commits

Author SHA1 Message Date
Paul Trautrim
af2e082e43 Add implementation of getInterfaceHash()
Bug: 136065010
Test: m
Change-Id: I314f19aeca82cc8653eab71c9526ea7a208e6b50
2020-01-28 10:33:11 +09:00
Remi NGUYEN VAN
d2d2ea298a Merge "Add support for Ethernet tethering" 2020-01-27 13:01:29 +00:00
Remi NGUYEN VAN
84229e0a8e Add support for Ethernet tethering
Ethernet tethering can be started via
startTethering(TETHERING_ETHERNET).

Test: flashed, enabled ethernet tethering, verified internet access on
      downstream.
Bug: 130840861

Change-Id: I34842acd94b972e440c3622f7617df10c18acf65
2020-01-27 19:31:08 +09:00
Baligh Uddin
4acc296733 Remove hardcoded min, targetSDK for 'R' version of modules
BUG: 130541924
Change-Id: Idba436b7983c92e5a4f727e32456552bccb3990f
Exempt-From-Owner-Approval: baligh@ approving to unblock TM
2020-01-24 10:36:11 -08:00
Remi NGUYEN VAN
f142af20f6 Merge "Local Tethering with ncm interface" 2020-01-24 13:59:55 +00:00
Milim Lee
31ef4c0520 Local Tethering with ncm interface
Bug: 130840842
Test: build, boot
      atest TetheringTest
      manual test (call startTethering(TETHERING_NCM))

Change-Id: Icc6c4d6be39e787503cecf3a5835b40d4be12a57
2020-01-24 19:18:04 +09:00
Remi NGUYEN VAN
b7ec6d6d5a Merge "Add API for tethering clients change" 2020-01-24 09:07:10 +00:00
Remi NGUYEN VAN
de933af7a7 Add API for tethering clients change
Add a onClientsChanged callback to OnTetheringEventCallback.

The callback will provide information on connected clients combining
at least DHCP leases and WiFi AP information (WiFi AP tethering used).

Test: atest TetheringTests
Bug: 135411507
Change-Id: I7065d081c11bc606d691f76ac8b499dd075d6504
2020-01-24 13:21:59 +09:00
Remi NGUYEN VAN
5f19eb15fd Merge "Allows the caller to specify configuration by TetheringRequest" 2020-01-24 02:38:52 +00:00
markchien
e8b9d75557 Allows the caller to specify configuration by TetheringRequest
This is initial work to allow caller to pass their prefered
configuration to start tethering. Caller may able to specify the
downstream interface ipv4 address with dhcp server disabled for
static IP configuration, or able to exempt entitlement check if
they have permission in follow up CL.

Bug: 141256482
Test: -atest TetheringTest
      -ON/OFF wifi tethering

Change-Id: Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3
2020-01-23 23:19:23 +09:00
Remi NGUYEN VAN
a96f449ce2 Merge "Make TetheringManager to system API" 2020-01-23 00:11:49 +00:00
markchien
40898cacc2 Make TetheringManager to system API
Also deprecated tethering APIs in ConnectivityManager.
Will have follow up change to remove @hide tethering function in
ConnectivityManager.

Bug: 145093446
Bug: 148038547
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ia432057bf9056727c4a0ca97d160a49274d33581
2020-01-23 00:41:59 +09:00
Automerger Merge Worker
68a1dfe382 Merge "add java_api_finder plugin to tethering module" am: 05c43b7095 am: 1d97c995f2 am: a277a46187
Change-Id: Ic00cb4f98e0d74d224de001f436928c8032f920b
2020-01-17 21:59:08 +00:00
Automerger Merge Worker
8888c82df6 Merge "p2p: revise tethering handler for shared group interface support" am: 0bbf289b09 am: bbbe6f7ba5 am: c9bde4be72
Change-Id: I512a950fc395518bc46dd99590bfdcbe3b10bed3
2020-01-17 21:48:36 +00:00
Mark Chien
05c43b7095 Merge "add java_api_finder plugin to tethering module" 2020-01-17 03:16:34 +00:00
Roshan Pius
d26218b6d7 Revert "wifi-service: Jar-Jar net util library"
Reason for revert: b/147807058

Reverted Changes:
I902b7b742: telephony: jar-jar net.util classes on the usage s...
I90a9c537b: wifi-service: Link net util libraries
Ic3b92ca63: libs(net/common): Fixes for wifi to include.
Ib2fb2bf05: wifi-service: Jar-Jar net util library.

Bug: 147807058
Change-Id: I6a0cf666be126f45b859e38446862654e056a009
2020-01-16 16:45:41 +00:00
Jimmy Chen
151384dda4 p2p: revise tethering handler for shared group interface support
When leaving a group, all information are erased and no group interface
is passed to tethering service.
For separate group interface, tethering could be stopped
on p2p group interface removed. For shared group interface,
i.e. management interface and group interface share one
interface, ex. p2p0, tethering has no chance to be stopped since management
interface won't be removed after leaving a group.

Bug: 141382930
Test: atest FrameworksNetTests
Test: atest FrameworksWifiTests
Test: atest TetheringTests
Change-Id: Ib611018b67c76ff79c7e6658136721090feb145b
2020-01-16 14:33:32 +08:00
Treehugger Robot
57726b758e Merge "TetheringTests: Stop using @hide Wifi P2P APIs" 2020-01-16 05:51:49 +00:00
markchien
8fad208905 add java_api_finder plugin to tethering module
This is used to generate java APIs used by tethering module

Bug: 145490751
Test:  m com.android.tethering RUN_ERROR_PRONE=true

Change-Id: I97c26e3dcdf4f4c5017f1df582a16335c613f8dd
2020-01-16 13:07:36 +08:00
Roshan Pius
b4e491a64c wifi-service: Jar-Jar net util library
Also, change tetheringInterfaceUtils to use the same jar-jar rules.

Bug: 135998869
Test: Compiles
Test: Number of compile errors when compiled against system_current
reduces.

Change-Id: Ib2fb2bf0556af3ce1519f213f7805620675d7db7
2020-01-15 15:51:31 -08:00
TreeHugger Robot
7e0817d906 Merge "Tethering: build tethering as unbundled APP" 2020-01-15 18:20:25 +00:00
TreeHugger Robot
cdecdea7a8 Merge "Tethering: Fix hidden API selectBestRoute" 2020-01-15 17:45:59 +00:00
Automerger Merge Worker
0ec08df9b1 Merge "Tethering: remove redundant source code" am: 7f9b3ca809 am: 69c72da2c7 am: 00356b8d79
Change-Id: Ifb9903a985090e85d85e642bd3e6d5a1d68b6bfb
2020-01-15 12:34:28 +00:00
markchien
645058f9fb Tethering: build tethering as unbundled APP
Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I09117228c193137f6359fdcfced38352b8a38f57
2020-01-15 11:55:26 +00:00
markchien
38d3b2c9f0 Tethering: Fix hidden API selectBestRoute
Bug: 143925787
Test: -build, flash, boot
      -ON/OFF hotspot
      -atest TetheringTests

Change-Id: I824a05fac8b606123667d20ab9b1f7de905e4088
2020-01-15 11:55:06 +00:00
Mark Chien
7f9b3ca809 Merge "Tethering: remove redundant source code" 2020-01-15 11:51:07 +00:00
Mark Chien
52795b4893 Merge "Tethering: add p2p regex for tethering modes" 2020-01-15 10:12:28 +00:00
Automerger Merge Worker
4c0487a163 Merge "Allow opening tethering when data saver ON" am: bd7fa99584 am: 80cc1ede37 am: dbefc5e6ac
Change-Id: I24a842de6918ccd0eb1dc60161854ea25528dff5
2020-01-15 07:29:40 +00:00
Mark Chien
bd7fa99584 Merge "Allow opening tethering when data saver ON" 2020-01-15 06:58:29 +00:00
markchien
383f4b1ec2 Tethering: add p2p regex for tethering modes
Bug: 147399354
Test: build
Change-Id: Iec666cc302ee749ddb57379f42f1e540ed813e48
2020-01-15 14:50:59 +08:00
Automerger Merge Worker
067947131e Merge "Tethering: switch to use tethering package resources" am: 49b8c99f2c am: 01224e019f am: f1e67d5b17
Change-Id: I3f3ba0792f2ac0c4137381cbb6e49d533a136845
2020-01-15 06:44:39 +00:00
Mark Chien
49b8c99f2c Merge "Tethering: switch to use tethering package resources" 2020-01-15 06:17:06 +00:00
Automerger Merge Worker
4e37fa7cb3 Merge changes from topic "sp06-offloadcontroller" am: 01d30a4ce0 am: b61116705a am: c6a841b77b
Change-Id: I4e7924ebb2d37ecffb8facce0ec51643afb12264
2020-01-15 05:33:32 +00:00
markchien
6aa796135c Tethering: remove redundant source code
Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I92cbb51a0d4fb048aa75ba9932e3b106d181bad9
2020-01-15 04:33:10 +00:00
David Su
025eab036f Merge changes from topics "frameworkswifiapitests-jacoco", "settingsunittests-wifi-systemapi", "sl4a-access-wifi-hidden-apis"
* changes:
  Remove FrameworksWifiApiTests jacoco exclude_filter
  FrameworksWifiApiTests: build against framework-wifi (Attempt 2)
  Convert FrameworksWifiApiTests mk to bp (Attempt 2)
  Give SL4A access to @hide Wifi APIs
  Expose WifiInfo & NetworkSelectionStatus Builders for SettingsUnitTests
  Expose WifiEnterpriseConfig.getClientPrivateKey() for WifiConfigurationProviderTest
  Expose ScanResult constructor for SettingsLibRoboTests
  SettingsLibTests: grant access to Wifi @hide APIs
  TetheringTests: Stop using @hide Wifi P2P APIs
2020-01-14 18:06:27 +00:00
markchien
3fe660bc4a Allow opening tethering when data saver ON
When data saver enabled, tethering would be OFF.
Currently settings would not allow user to turning tethering back.
After aosp/1181583 is merged, user can turn tethering back without
turning data saver OFF.

Bug: 145711175
Bug: 142374233
Test: atest TetheringTests
      OFF/ON tethering when data saver ON

Change-Id: I59e662ba771a563f5f1766ba29e05246b8280220
2020-01-14 20:15:31 +08:00
junyulai
caa810011c [SP09] Remove NetworkStatsService @hide usage in Tethering
Test: atest TetheringTest
Bug: 130855321
Change-Id: I0260524c57f7c0aa738eaff07f9b0ae8e785ed63
2020-01-14 20:15:19 +08:00
junyulai
e3f4143dc9 [SP07] Remove reference of NetworkStatsService in IpServer
Currently NetworkStatsService is notified when downstream is
updated. However, it seems unnecessary given that tether stats
is persist since boot, and there is no any upstream change when
downstream is changed.

Test: atest NetworkStatsServiceTest IpServerTest
Bug: 130855321
Change-Id: Ie300bfeb0a04678fcfcf300843b6f859af9df91d
2020-01-14 20:14:59 +08:00
junyulai
37ed835f3a [SP06.1] Add UPDATE_DEVICE_STATS permission to Tethering
Add corresponding permission to allow tether offload to update
network usage through new API that requires UPDATE_DEVICE_STATS
permission.

This is the minimum permission that required to update network
usage with the new system api.

Test: atest FrameworksNetTests OffloadControllerTest TetheringTest
Bug: 130855321
Change-Id: I9c0c86e20d4797ea3570feed741be3a07f839c7d
2020-01-14 20:14:47 +08:00
junyulai
fb7fb59a31 [SP06] Use system API to communicate with NSS in OffloadController
Test: atest FrameworksNetTests OffloadControllerTest TetheringTest
Bug: 130855321

Change-Id: I294be3a2874f8c8120857e308e629199af014fcd
2020-01-14 20:14:33 +08:00
markchien
67430df457 Use Context#getSystemService to get network stack binder
Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ic5fabeae27677344d691449c31ad9337c0e6d92c
2020-01-14 20:13:53 +08:00
markchien
da4519a7da Tethering: switch to use tethering package resources
Bug: 147399354
Test: build
Change-Id: I482788cdc8be3d34c9a922bfa7eb053f0aa87c96
2020-01-14 09:48:02 +00:00
David Su
dcaf6e22b4 TetheringTests: Stop using @hide Wifi P2P APIs
Instead use Mockito to achieve the same thing.

Bug: 138801922
Test: atest TetheringTests
Change-Id: I41edd697017f4ce59e6707302bebc0da3d75831d
Merged-In: I41edd697017f4ce59e6707302bebc0da3d75831d
2020-01-13 13:15:14 -08:00
David Su
798a92b2a6 TetheringTests: Stop using @hide Wifi P2P APIs
Instead use Mockito to achieve the same thing.

Bug: 138801922
Test: atest TetheringTests
Change-Id: I41edd697017f4ce59e6707302bebc0da3d75831d
2020-01-13 12:49:21 -08:00
Automerger Merge Worker
dca6d8feca Merge "Migrate legacy dhcp server config to DeviceConfig" am: 5212ff1bf3 am: 08e7ddcbfb am: 803fd24c79
Change-Id: I43a2a55077bfd1da96c72e76b5289334ab22f2ea
2020-01-13 19:38:44 +00:00
Treehugger Robot
5212ff1bf3 Merge "Migrate legacy dhcp server config to DeviceConfig" 2020-01-13 19:12:25 +00:00
Automerger Merge Worker
74102e5f35 Merge "Replace setCapability usage in Tethering" am: ab9527a44b am: 751ff7535a am: 3bb9139941
Change-Id: I40ac5a58426e5c5141c9519ee4e009ce9de2704c
2020-01-13 18:31:43 +00:00
Treehugger Robot
ab9527a44b Merge "Replace setCapability usage in Tethering" 2020-01-13 17:56:25 +00:00
Automerger Merge Worker
dc54c4c7ea Merge "Add config_tether_* and entitlement resources" am: 2a27a6ade1 am: 18af5a920d am: e995e98d06
Change-Id: I1e89bd103c3886a48eeba4cb454845bb01f232f3
2020-01-13 17:36:12 +00:00
markchien
5e50b948d2 Replace setCapability usage in Tethering
Bug: 147413518
Test: build, flash, boot
Change-Id: I7abec2d7cf03d0675749e8379d624504ceb3d9af
2020-01-13 23:34:20 +08:00