Commit Graph

1530 Commits

Author SHA1 Message Date
Automerger Merge Worker
96bd3c53f6 Merge "Do not block for connector in TetheringManager" am: 283abc0ad4 am: bd9b1908fb am: e094cf9519
Change-Id: If1187beb53716d2c8f9855634a9b913ffceee604
2020-01-31 16:27:56 +00:00
Remi NGUYEN VAN
db2365d74c Merge "Tethering: build tethering as unbundled APP" 2020-01-31 07:40:30 +00:00
Remi NGUYEN VAN
95a55b3839 Merge "Tethering: Fix hidden API selectBestRoute" 2020-01-31 07:40:16 +00:00
markchien
674a25d84e Fix NPE in tethering startup
mUserManager should be ready before #makeTethering because mTethering may
call isTetheringSupported which need to reference mUserManager

Bug: 148642028
Test: build
Change-Id: I100b5d6cc8f49640c33fa930b819033de5d6492c
2020-01-31 14:04:36 +08:00
markchien
9574f5e1c8 Tethering: build tethering as unbundled APP
Bug: 143195885
Test: -build, flash, boot
      -atest TetheringTests

Merged-In: I09117228c193137f6359fdcfced38352b8a38f57
Change-Id: I09117228c193137f6359fdcfced38352b8a38f57
(clean cherry-pick)
2020-01-30 11:50:01 +09:00
markchien
75fc6ab629 Tethering: Fix hidden API selectBestRoute
Bug: 143925787
Test: -build, flash, boot
      -ON/OFF hotspot
      -atest TetheringTests

Merged-In: I824a05fac8b606123667d20ab9b1f7de905e4088
Change-Id: I824a05fac8b606123667d20ab9b1f7de905e4088
(clean cherry-pick)
2020-01-30 11:49:44 +09:00
Remi NGUYEN VAN
283abc0ad4 Merge "Do not block for connector in TetheringManager" 2020-01-29 23:46:00 +00:00
Remi NGUYEN VAN
2a85986866 Do not block for connector in TetheringManager
Instead of blocking for the ITetheringConnector, in the rare case (only
on boot) that the connector is not ready, queue requests and poll for
the connector until it is available.

Bug: 146821053
Test: Flashed, verified tethering working
Change-Id: I4bd45fcbdce2336694c3b6a349f121e40230f001
2020-01-29 15:15:58 +09:00
Automerger Merge Worker
20bacb280b [automerger skipped] Merge "Add implementation of getInterfaceHash()" am: cf495511df am: 96866b6ce3 am: 24026e0a62 -s ours
am skip reason: Change-Id I314f19aeca82cc8653eab71c9526ea7a208e6b50 with SHA-1 60f090a8ff is in history

Change-Id: I5410c6c461d1dc78d2722a3d9f0d6c9b31376b17
2020-01-29 05:47:27 +00:00
Paul Trautrim
cf495511df Merge "Add implementation of getInterfaceHash()" 2020-01-29 05:12:12 +00:00
Paul Trautrim
bbfcd5421b Add implementation of getInterfaceHash()
Exempt-From-Owner-Approval: cherry-pick from internal
Bug: 136065010
Test: m
Change-Id: I314f19aeca82cc8653eab71c9526ea7a208e6b50
Merged-In: I314f19aeca82cc8653eab71c9526ea7a208e6b50
2020-01-29 14:09:56 +09:00
Paul Trautrim
67129ae7ea Merge "Add implementation of getInterfaceHash()" 2020-01-28 23:34:16 +00:00
Automerger Merge Worker
0c7a4b7d8e [automerger skipped] Merge changes I34842acd,Icc6c4d6b am: 68578dd2ce am: b6081962ee am: cfc5bfc703 -s ours
am skip reason: Change-Id I34842acd94b972e440c3622f7617df10c18acf65 with SHA-1 5c14666b09 is in history

Change-Id: I7068557f0d30c9066e9bdcb2dd674dab8964a4b9
2020-01-28 11:18:31 +00:00
Lorenzo Colitti
68578dd2ce Merge changes I34842acd,Icc6c4d6b
* changes:
  Add support for Ethernet tethering
  Local Tethering with ncm interface
2020-01-28 10:43:33 +00:00
Remi NGUYEN VAN
0ef3b75ff5 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

Merged-In: I34842acd94b972e440c3622f7617df10c18acf65
Change-Id: I34842acd94b972e440c3622f7617df10c18acf65
(cherry-pick with conflicts in test-current.txt)
2020-01-28 17:52:06 +09:00
Milim Lee
45a971bd8c Local Tethering with ncm interface
Bug: 130840842
Test: build, boot
      atest TetheringTest
      manual test (call startTethering(TETHERING_NCM))

Merged-In: Icc6c4d6be39e787503cecf3a5835b40d4be12a57
Change-Id: Icc6c4d6be39e787503cecf3a5835b40d4be12a57
(clean cherry-pick)
2020-01-28 17:52:06 +09:00
Paul Trautrim
60f090a8ff Add implementation of getInterfaceHash()
Bug: 136065010
Test: m
Change-Id: I314f19aeca82cc8653eab71c9526ea7a208e6b50
2020-01-28 10:33:11 +09:00
Remi NGUYEN VAN
162e0a5d17 Merge "Add support for Ethernet tethering" 2020-01-27 13:01:29 +00:00
Remi NGUYEN VAN
5c14666b09 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
b901bfdd23 Merge "Remove hardcoded min, targetSDK for 'R' version of modules" 2020-01-24 22:04:30 +00:00
Baligh Uddin
bfc45e8b97 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
Automerger Merge Worker
36dbd3f1ee [automerger skipped] Merge changes I7065d081,Ic7c3a331,Ia432057b am: 2458be40f4 am: 172d2ce499 am: 06c8108318 -s ours
am skip reason: Change-Id I7065d081c11bc606d691f76ac8b499dd075d6504 with SHA-1 2781c80d28 is in history

Change-Id: Ifa5a0b23acc51bc01d480046a4354376083ff84a
2020-01-24 17:15:22 +00:00
Automerger Merge Worker
4256b0f4cc [automerger skipped] Allows the caller to specify configuration by TetheringRequest am: f6761bdd0c am: d4f206ce74 am: ef72953b83 -s ours
am skip reason: Change-Id Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3 with SHA-1 ecaba161bd is in history

Change-Id: I036e4263a187c92c88c7fc3d33484efd6b687fcb
2020-01-24 17:15:06 +00:00
Automerger Merge Worker
3b53035739 [automerger skipped] Make TetheringManager to system API am: 249752d8a3 am: 47eb5521e8 am: d26fddfdb6 -s ours
am skip reason: Change-Id Ia432057bf9056727c4a0ca97d160a49274d33581 with SHA-1 5786b6dc9a is in history

Change-Id: Ic852b8740f89c0107c770375fbae6f00e96a31c4
2020-01-24 17:15:03 +00:00
Remi NGUYEN VAN
3662c1bb6d 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
Merged-In: I7065d081c11bc606d691f76ac8b499dd075d6504
2020-01-24 23:39:50 +09:00
markchien
f6761bdd0c 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
Merged-In: Ic7c3a33195bbd7e72f9b8e73fa148be476b87bf3
2020-01-24 23:39:50 +09:00
markchien
249752d8a3 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
Merged-In: Ia432057bf9056727c4a0ca97d160a49274d33581
2020-01-24 23:39:49 +09:00
Remi NGUYEN VAN
38ee05ed8f Merge "Local Tethering with ncm interface" 2020-01-24 13:59:55 +00:00
Milim Lee
97c36bc8c3 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
ab7e30807e Merge "Add API for tethering clients change" 2020-01-24 09:07:10 +00:00
Remi NGUYEN VAN
2781c80d28 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
ccef484ff1 Merge "Allows the caller to specify configuration by TetheringRequest" 2020-01-24 02:38:52 +00:00
markchien
ecaba161bd 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
5a22b9a22f Merge "Make TetheringManager to system API" 2020-01-23 00:11:49 +00:00
markchien
5786b6dc9a 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
299bb8f7c6 Merge "add java_api_finder plugin to tethering module" am: cdf60baad8 am: 1d97c995f2 am: a277a46187
Change-Id: Ic00cb4f98e0d74d224de001f436928c8032f920b
2020-01-17 21:59:08 +00:00
Automerger Merge Worker
b499ecedc6 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
cdf60baad8 Merge "add java_api_finder plugin to tethering module" 2020-01-17 03:16:34 +00:00
Roshan Pius
ca843bbb78 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
Roshan Pius
976cb8d0af 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
2020-01-16 13:05:13 +00:00
Automerger Merge Worker
92e12f40d9 [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
2020-01-16 07:22:18 +00:00
Jimmy Chen
ea902f6f2a 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
81369f59d2 Merge "TetheringTests: Stop using @hide Wifi P2P APIs" 2020-01-16 05:51:49 +00:00
markchien
84a9282ecd 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
74447aa1f5 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
07c875d663 Merge "Tethering: build tethering as unbundled APP" 2020-01-15 18:20:25 +00:00
TreeHugger Robot
8b754097f3 Merge "Tethering: Fix hidden API selectBestRoute" 2020-01-15 17:45:59 +00:00
Automerger Merge Worker
6d22290067 Merge "Tethering: remove redundant source code" am: 18401e3bb0 am: 69c72da2c7 am: 00356b8d79
Change-Id: Ifb9903a985090e85d85e642bd3e6d5a1d68b6bfb
2020-01-15 12:34:28 +00:00
markchien
51706aae8b 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
78c1bbcf14 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