Commit graph

151 commits

Message SHA1
Merge "Add API for tethering clients change"
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2020-01-24 09:07:10 +00:00
ab7e30807e
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

Remi NGUYEN VAN   commited 2020-01-24 13:21:59 +09:00
2781c80d28
Merge "Allows the caller to specify configuration by TetheringRequest"
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2020-01-24 02:38:52 +00:00
ccef484ff1
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

markchien   authored and   Remi NGUYEN VAN   commited 2020-01-23 23:19:23 +09:00
ecaba161bd
Merge "Make TetheringManager to system API"
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2020-01-23 00:11:49 +00:00
5a22b9a22f
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

markchien   authored and   Remi NGUYEN VAN   commited 2020-01-23 00:41:59 +09:00
5786b6dc9a
Merge "add java_api_finder plugin to tethering module" am: cdf60baad8 am: 1d97c995f2 am: a277a46187
Change-Id: Ic00cb4f98e0d74d224de001f436928c8032f920b

Automerger Merge Worker   commited 2020-01-17 21:59:08 +00:00
299bb8f7c6
Merge "p2p: revise tethering handler for shared group interface support" am: 0bbf289b09 am: bbbe6f7ba5 am: c9bde4be72
Change-Id: I512a950fc395518bc46dd99590bfdcbe3b10bed3

Automerger Merge Worker   commited 2020-01-17 21:48:36 +00:00
b499ecedc6
Merge "add java_api_finder plugin to tethering module"
Mark Chien   authored and   Gerrit Code Review   commited 2020-01-17 03:16:34 +00:00
cdf60baad8
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

Roshan Pius   commited 2020-01-16 16:45:41 +00:00
ca843bbb78
Merge changes from topics "user_remove_extra_user", "wifi_net_utils"
* changes:
  UserManagerService: Add UserHandle extra to user added/removed broadcast
  wifi-service: Jar-Jar net util library
  WifiManager: Add API to query STA + AP concurrency

Roshan Pius   authored and   Android (Google) Code Review   commited 2020-01-16 13:05:13 +00:00
976cb8d0af
[automerger skipped] Merge "TetheringTests: Stop using @hide Wifi P2P APIs" am: 81369f59d2 am: e87929a4b8 am: 8b9a742ff4 -s ours
am skip reason: Change-Id I41edd697017f4ce59e6707302bebc0da3d75831d with SHA-1 5479a4e669 is in history

Change-Id: I4a384a120904cbdb5080b2a93da69b8f793b8a97

Automerger Merge Worker   commited 2020-01-16 07:22:18 +00:00
92e12f40d9
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

Jimmy Chen   commited 2020-01-16 14:33:32 +08:00
ea902f6f2a
Merge "TetheringTests: Stop using @hide Wifi P2P APIs"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-01-16 05:51:49 +00:00
81369f59d2
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

markchien   commited 2020-01-16 13:07:36 +08:00
84a9282ecd
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

Roshan Pius   commited 2020-01-15 15:51:31 -08:00
74447aa1f5
Merge "Tethering: build tethering as unbundled APP"
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-01-15 18:20:25 +00:00
07c875d663
Merge "Tethering: Fix hidden API selectBestRoute"
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2020-01-15 17:45:59 +00:00
8b754097f3
Merge "Tethering: remove redundant source code" am: 18401e3bb0 am: 69c72da2c7 am: 00356b8d79
Change-Id: Ifb9903a985090e85d85e642bd3e6d5a1d68b6bfb

Automerger Merge Worker   commited 2020-01-15 12:34:28 +00:00
6d22290067
Tethering: build tethering as unbundled APP
Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I09117228c193137f6359fdcfced38352b8a38f57

markchien   authored and   Mark Chien   commited 2020-01-15 11:55:26 +00:00
51706aae8b
Tethering: Fix hidden API selectBestRoute
Bug: 143925787
Test: -build, flash, boot
      -ON/OFF hotspot
      -atest TetheringTests

Change-Id: I824a05fac8b606123667d20ab9b1f7de905e4088

markchien   authored and   Mark Chien   commited 2020-01-15 11:55:06 +00:00
78c1bbcf14
Merge "Tethering: remove redundant source code"
Mark Chien   authored and   Gerrit Code Review   commited 2020-01-15 11:51:07 +00:00
18401e3bb0
Merge "Tethering: add p2p regex for tethering modes"
Mark Chien   authored and   Android (Google) Code Review   commited 2020-01-15 10:12:28 +00:00
c3bd773863
Merge "Allow opening tethering when data saver ON" am: 99c7c0fe87 am: 80cc1ede37 am: dbefc5e6ac
Change-Id: I24a842de6918ccd0eb1dc60161854ea25528dff5

Automerger Merge Worker   commited 2020-01-15 07:29:40 +00:00
afae2bad30
Merge "Allow opening tethering when data saver ON"
Mark Chien   authored and   Gerrit Code Review   commited 2020-01-15 06:58:29 +00:00
99c7c0fe87
Tethering: add p2p regex for tethering modes
Bug: 147399354
Test: build
Change-Id: Iec666cc302ee749ddb57379f42f1e540ed813e48

markchien   commited 2020-01-15 14:50:59 +08:00
1a4b23585a
Merge "Tethering: switch to use tethering package resources" am: 4cefaf8bc8 am: 01224e019f am: f1e67d5b17
Change-Id: I3f3ba0792f2ac0c4137381cbb6e49d533a136845

Automerger Merge Worker   commited 2020-01-15 06:44:39 +00:00
96d7b00caf
Merge "Tethering: switch to use tethering package resources"
Mark Chien   authored and   Gerrit Code Review   commited 2020-01-15 06:17:06 +00:00
4cefaf8bc8
Merge changes from topic "sp06-offloadcontroller" am: 01d30a4ce0 am: b61116705a am: c6a841b77b
Change-Id: I4e7924ebb2d37ecffb8facce0ec51643afb12264

Automerger Merge Worker   commited 2020-01-15 05:33:32 +00:00
4d4aaaf243
Tethering: remove redundant source code
Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I92cbb51a0d4fb048aa75ba9932e3b106d181bad9

markchien   authored and   Mark Chien   commited 2020-01-15 04:33:10 +00:00
4ddf692e11
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

David Su   authored and   Android (Google) Code Review   commited 2020-01-14 18:06:27 +00:00
d124508c2d
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

markchien   commited 2020-01-14 20:15:31 +08:00
eaaebd1f0f
[SP09] Remove NetworkStatsService @hide usage in Tethering
Test: atest TetheringTest
Bug: 130855321
Change-Id: I0260524c57f7c0aa738eaff07f9b0ae8e785ed63

junyulai   authored and   markchien   commited 2020-01-14 20:15:19 +08:00
f858a57887
[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

junyulai   authored and   markchien   commited 2020-01-14 20:14:59 +08:00
5864a3f0aa
[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

junyulai   authored and   markchien   commited 2020-01-14 20:14:47 +08:00
15d8bb03fe
[SP06] Use system API to communicate with NSS in OffloadController
Test: atest FrameworksNetTests OffloadControllerTest TetheringTest
Bug: 130855321

Change-Id: I294be3a2874f8c8120857e308e629199af014fcd

junyulai   authored and   markchien   commited 2020-01-14 20:14:33 +08:00
b7da74af88
Use Context#getSystemService to get network stack binder
Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: Ic5fabeae27677344d691449c31ad9337c0e6d92c

markchien   commited 2020-01-14 20:13:53 +08:00
2fbb412b28
Tethering: switch to use tethering package resources
Bug: 147399354
Test: build
Change-Id: I482788cdc8be3d34c9a922bfa7eb053f0aa87c96

markchien   authored and   Mark Chien   commited 2020-01-14 09:48:02 +00:00
873c64ab8f
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

David Su   commited 2020-01-13 13:15:14 -08:00
dd66bcd894
TetheringTests: Stop using @hide Wifi P2P APIs
Instead use Mockito to achieve the same thing.

Bug: 138801922
Test: atest TetheringTests
Change-Id: I41edd697017f4ce59e6707302bebc0da3d75831d

David Su   commited 2020-01-13 12:49:21 -08:00
5479a4e669
Merge "Migrate legacy dhcp server config to DeviceConfig" am: 63647c2d7a am: 08e7ddcbfb am: 803fd24c79
Change-Id: I43a2a55077bfd1da96c72e76b5289334ab22f2ea

Automerger Merge Worker   commited 2020-01-13 19:38:44 +00:00
2246030518
Merge "Migrate legacy dhcp server config to DeviceConfig"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-01-13 19:12:25 +00:00
63647c2d7a
Merge "Replace setCapability usage in Tethering" am: d9768c7111 am: 751ff7535a am: 3bb9139941
Change-Id: I40ac5a58426e5c5141c9519ee4e009ce9de2704c

Automerger Merge Worker   commited 2020-01-13 18:31:43 +00:00
2d5ac2c624
Merge "Replace setCapability usage in Tethering"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-01-13 17:56:25 +00:00
d9768c7111
Merge "Add config_tether_* and entitlement resources" am: 2a27a6ade1 am: 18af5a920d am: e995e98d06
Change-Id: I1e89bd103c3886a48eeba4cb454845bb01f232f3

Automerger Merge Worker   commited 2020-01-13 17:36:12 +00:00
29db00037c
Replace setCapability usage in Tethering
Bug: 147413518
Test: build, flash, boot
Change-Id: I7abec2d7cf03d0675749e8379d624504ceb3d9af

markchien   commited 2020-01-13 23:34:20 +08:00
6df8068085
Migrate legacy dhcp server config to DeviceConfig
Legacy dhcp server can also be enabled by resource config.

Bug: 144814607
Test: -build, flash, boot
      -atest TetheringTests

Change-Id: I8ae5fa3d5bbd88129bd0890f71be6f8a1bfec0eb

markchien   authored and   Mark Chien   commited 2020-01-13 15:07:03 +00:00
9a0b95d294
Add config_tether_* and entitlement resources
Copies config_tether_* and entitlement resources from
framework/base/core/res to tethering package. Will have
follow up changes to move overlay and switch tethering to
use this internal resource. duplicated resource in framework
will be removed after fixing all of users(e.g. test, TetherUtil,
Settings, ....).

Bug: 147399354
Test: build

Change-Id: I2a77e5070d53566d5ec3697358a6dbbebb4ff59f

markchien   authored and   Mark Chien   commited 2020-01-13 15:03:11 +00:00
6fbbdff5bc
[automerger skipped] Merge "Use new UnsupportedAppUsage annotation." am: 5e9d0685dc am: 1f8ff9d305 am: 1e7a3e8160 -s ours
am skip reason: Change-Id I288969b0c22fa3a63bc2e71bb5009fe4a927e154 with SHA-1 2e1ad6ef00 is in history

Change-Id: I3f9d26ac9c3ef27f3ad10a8bdf04c820ba8a470f

Automerger Merge Worker   commited 2020-01-13 13:33:20 +00:00
e44489cc72
Merge "Use new UnsupportedAppUsage annotation."
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-01-13 13:05:17 +00:00
5e9d0685dc