Commit Graph

319 Commits

Author SHA1 Message Date
Automerger Merge Worker
f699cd14f5 Merge "Change TetheringConstants class to final" am: 0c5f387efe am: fd2db9bf0a
Change-Id: I5c4a3c1b011b6a0eeda8473b9206c4adf307c168
2020-03-16 05:47:02 +00:00
Automerger Merge Worker
fd2db9bf0a Merge "Change TetheringConstants class to final" am: 0c5f387efe
Change-Id: I3446ad5a368b9f127066ba1e133a7191afe80c2b
2020-03-16 05:33:55 +00:00
Mark Chien
0c5f387efe Merge "Change TetheringConstants class to final" 2020-03-16 05:25:40 +00:00
Automerger Merge Worker
d946b2f5d5 Merge "Give tethering bluetooth privilege permission" am: 1d68778a35 am: 52534a2358
Change-Id: I86a0fc5498d6c77e032c839d09c018906ec78b42
2020-03-16 05:06:57 +00:00
Automerger Merge Worker
52534a2358 Merge "Give tethering bluetooth privilege permission" am: 1d68778a35
Change-Id: I4410ec8ae4331b663fe22edfd2705e3126ae1d82
2020-03-16 04:48:50 +00:00
Mark Chien
1d68778a35 Merge "Give tethering bluetooth privilege permission" 2020-03-16 04:46:44 +00:00
Automerger Merge Worker
fd96c7cc49 Merge "[SP21] Address comments for API council review about aosp/1172143" am: 12b21035c4 am: be47eb855f
Change-Id: Ic4d1d7f7ce4bf8c6bf03fbe1da57216a8179bca9
2020-03-16 03:14:45 +00:00
Automerger Merge Worker
2c655ed0a1 Merge "Cleanup the TetheredClients API" am: 89711eaefe am: 7d28e4e36e
Change-Id: Ia519886b34b5bc7b5d665699cc14a58feb32d4a0
2020-03-16 03:14:31 +00:00
Automerger Merge Worker
fc9abbb159 [SP21] Address comments for API council review about aosp/1172143 am: 5752baa6b6 am: 2a24054c31
Change-Id: I86cf3b57722f64c0989ce606fde71d6173f812bb
2020-03-16 03:14:01 +00:00
Automerger Merge Worker
be47eb855f Merge "[SP21] Address comments for API council review about aosp/1172143" am: 12b21035c4
Change-Id: Ief866c87b9e69b892fca435e8555080ffdad4af7
2020-03-16 03:05:06 +00:00
Automerger Merge Worker
7d28e4e36e Merge "Cleanup the TetheredClients API" am: 89711eaefe
Change-Id: I3aa44ae9b4d9ec5c34bca067d1ec2486d9dbb2c0
2020-03-16 03:04:26 +00:00
Automerger Merge Worker
2a24054c31 [SP21] Address comments for API council review about aosp/1172143 am: 5752baa6b6
Change-Id: I8634d6f6ed65ec6b10009a90b147881fe1fc4530
2020-03-16 03:03:51 +00:00
Junyu Lai
12b21035c4 Merge "[SP21] Address comments for API council review about aosp/1172143" 2020-03-16 02:41:19 +00:00
markchien
4b896ba32b Change TetheringConstants class to final
Bug: 151322331
Test: m doc-comment-check-docs
Change-Id: Ia02be3d1d91a08ae4a56b25560ed448c96a693db
2020-03-15 22:54:57 +08:00
Remi NGUYEN VAN
dfdf750417 Cleanup the TetheredClients API
Add comments to getters as requested in API review, and remove the
expirationTime private field that was planned to be replaced with
LinkAddress expiration.

Test: atest TetheringTests
Fixes: 150878126
Change-Id: Iecf65859cdeeaac2fa7b817b4f505c510424ac89
2020-03-13 19:01:15 +09:00
markchien
db2a16b8c4 Give tethering bluetooth privilege permission
Permisssion of PanService#setBluetoothTethering is change from
BLUETOOTH_ADMIN to BLUETOOTH_PRIVILEGED.
Tethering service need bluetooth privilege permission to enable
bluetooth tethering.

Bug: 146045934
Test: on/off bluetooth tethering
Change-Id: Ib87a5d5a5bb49390aa55e52713bb3539d4a52348
2020-03-13 07:06:58 +00:00
Automerger Merge Worker
60f2dc6fcf [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 73f2ecbcd6 -s ours am: 4eaac7f546 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibebb2e37d26e9670102e0983f8937fed3e5b378f
2020-03-13 01:59:14 +00:00
Bill Yi
97eb4abfed Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I8c6eed7de942d3b4d67ad1205ccabf5852ef928f
2020-03-12 16:41:15 -07:00
junyulai
5752baa6b6 [SP21] Address comments for API council review about aosp/1172143
Test: atest FrameworksNetTests ImsPhoneCallTrackerTest
Test: atest TetheringTests NetworkStackTests
Test: m doc-comment-check-docs
Fix: 148552904

Change-Id: I141393f229e772d2eb9f7c156849e379bd71b845
2020-03-12 21:34:17 +08:00
Automerger Merge Worker
6030bad6f0 Merge "Create all variants of stubs for tethering" into rvc-dev am: ab74d2b865
Change-Id: I2d0c2b3b453ded7549e6560fc2af99807e7642fc
2020-03-11 10:32:37 +00:00
Anton Hansson
ab74d2b865 Merge "Create all variants of stubs for tethering" into rvc-dev 2020-03-11 10:16:02 +00:00
Anton Hansson
6a9c68b619 Create all variants of stubs for tethering
Add separate publicapi, systemapi and module_libs stubs for tethering.

Bug: 147768409
Test: m
Test: m framework-tethering-stubs-{public,system,module_libs_}api
Change-Id: I0ed44691b4e7080818442a9d0eb37d874f707195
2020-03-10 13:13:36 +00:00
Automerger Merge Worker
8799683ed7 [automerger skipped] Merge "[SP19] Reduce log when set limit and request stats update" into rvc-dev am: 407e9eb150 -s ours
am skip reason: Change-Id I92d214f4648fec6be13e04147290ecdd156fab4e with SHA-1 cb3c305fd1 is in history

Change-Id: Ic1d1d570b6ec21b06be212160d3415755e3a2f9e
2020-03-10 03:08:16 +00:00
Lorenzo Colitti
407e9eb150 Merge "[SP19] Reduce log when set limit and request stats update" into rvc-dev 2020-03-10 03:06:21 +00:00
Automerger Merge Worker
6617b3410d [automerger skipped] Merge "Send offload status changed callback" into rvc-dev am: 47f84e53b0 -s ours
am skip reason: Change-Id Ia0398601144b0e5f61dc0c5771eacf13e7cfbb59 with SHA-1 05bee8027d is in history

Change-Id: I33a320dd5a619047a11632314f9928bf2c5f3dcb
2020-03-09 10:04:52 +00:00
Automerger Merge Worker
8299c59cd4 [automerger skipped] Merge "Tethering: add isTetheringSupported with callerPkg parameter" into rvc-dev am: 137cb5acfe -s ours
am skip reason: Change-Id I2a35e1b6851e7a799c343be0dd60da23514768ba with SHA-1 06ea03a6c4 is in history

Change-Id: I8b26edf8bb0b445558f1bf6f400118ee1a927401
2020-03-09 10:04:20 +00:00
Mark Chien
47f84e53b0 Merge "Send offload status changed callback" into rvc-dev 2020-03-09 09:50:20 +00:00
Mark Chien
137cb5acfe Merge "Tethering: add isTetheringSupported with callerPkg parameter" into rvc-dev 2020-03-09 09:49:56 +00:00
Automerger Merge Worker
dc7df56395 Merge "[TNU01] Add Tethering notification updater" am: ccf6239513 am: 40631d6989
Change-Id: I71070e0e18a752a25ac94b97901bbed0aedf4a7e
2020-03-09 08:24:39 +00:00
Automerger Merge Worker
ff7e196f48 [automerger skipped] Merge "Fix crash and duplicated ethernet tethering request" into rvc-dev am: cf9a67a5db -s ours
am skip reason: Change-Id I7c5127e96d80d077735010d2e62c7227805ccb10 with SHA-1 3849d89111 is in history

Change-Id: I8c338aedd21b50b412d600d165c1d0f63453d52a
2020-03-09 08:20:47 +00:00
Paul Hu
ccf6239513 Merge "[TNU01] Add Tethering notification updater" 2020-03-09 08:10:55 +00:00
Automerger Merge Worker
74f27e6f63 Send offload status changed callback
The callback would be fired when offload started, stopped, or failed.
If offload is not supported, "failed" callback would be fired when user
enable tethering. Enabling multiple tethering would not have multiple
offload status callbacks because offload should already be started or
failed.

Bug: 130596697
Test: -build, flash, boot
      -atest TetheringTests
      -ON/OFF hotspotf

Change-Id: Ifb16dcedc8081833fa95a39596fe5cdc309ededd
Merged-In: Ifb16dcedc8081833fa95a39596fe5cdc309ededd
Merged-In: Ia0398601144b0e5f61dc0c5771eacf13e7cfbb59
(cherry picked from commit cd266076bed28459234c5d74ad373867944df116)
2020-03-09 07:59:29 +00:00
Automerger Merge Worker
cee6cd88ee [SP19] Reduce log when set limit and request stats update
setLimit can be ignored if the quota is unlimited and not
changed, and the log could be omitted since it will still be
logged in HAL. Request stats update will print error log in
service if it is not correctly responded in time.

Test: atest TetheringTests
Test: manual
Fix: 149735152
AOSP-Change: 1242601
Change-Id: I01c0191d5b89942fa69b167b8a6b40ed2821300b
Merged-In: I92d214f4648fec6be13e04147290ecdd156fab4e
(cherry picked from commit b9565c7db00e44b50f9983691b603ebd6918ee45)
2020-03-09 07:54:27 +00:00
Mark Chien
cf9a67a5db Merge "Fix crash and duplicated ethernet tethering request" into rvc-dev 2020-03-09 07:51:43 +00:00
Automerger Merge Worker
2b9a5102a4 Merge "Merge the following changes to tethering:" into rvc-dev am: 888d833d11
Change-Id: I4b16e09153aa6991fcb933b097270826b5920a82
2020-03-09 05:35:12 +00:00
Automerger Merge Worker
d98059ce5c [automerger skipped] Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b94 -s ours
am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 03a734f352 is in history

Change-Id: I4946d69633eb2e00ca9fa566f6b85fc82f071665
2020-03-09 05:35:04 +00:00
Automerger Merge Worker
bb7d0ce5f4 Merge "Send offload status changed callback" am: a24b188455 am: 1a762405b2
Change-Id: I5a963894fda3935f2f9643fc8483c3dd68112153
2020-03-09 03:28:35 +00:00
Automerger Merge Worker
f1194880cb Merge the following changes to tethering:
======
Fix a logic error in IpServerTest#addRemoveipv6ForwardingRules

When checking that link-local and multicast neighbours are
ignored, make sure the test neighbours are added on the correct
interface. Otherwise, they might be ignored because events on the
wrong interface are ignored, and not necessarily because
link-local and multicast neighbours are ignored.

Test: atest TetheringTests
Change-Id: I4a624ea4ce9ee9a9352afccbc7bf866587d4cdfa
======
Clear IPv6 forwarding rules when losing upstream or stopping.

Test: new unit test
Change-Id: I8626932e43e0daa300dad5fe6a81f47a6d667030
======

Bug: 149963652
Change-Id: I691053b22cb0b20e49419212f378cc473b1f35dc
(cherry picked from commit 3384bb9a4d7bd85370fe64e59f2872a5cab644d7)
2020-03-09 03:25:23 +00:00
Automerger Merge Worker
230178c6af Support losing the upstream in IpServerTest.
Allow dispatchTetherConnectionChanged to pass in a null
upstream interface and/or null LinkProperties. This will allow
future tests to check what happens when the upstream interface
goes away.

Bug: 149963652
Test: test-only change
Change-Id: I7cfc32d072f23644159d33700d6cd830c426ea19
Merged-In: I7cfc32d072f23644159d33700d6cd830c426ea19
(cherry picked from commit 62457f17e72c7ef0bee5c5bb1a04935a549b9fe6)
2020-03-09 03:02:22 +00:00
Mark Chien
a24b188455 Merge "Send offload status changed callback" 2020-03-09 02:52:07 +00:00
Automerger Merge Worker
1adfc1cbf1 Tethering: add isTetheringSupported with callerPkg parameter
BT tethering need to know whether tethering is supported for its caller
that call isTetheringSupported in binder thread under BT's process.
Current isTetheringSupported API is getting callerPkg inside
TetheringManager that would be BT's package name for bt tethering case.
Provide isTetheringSupported(String callerPkg) for caller to pass its
caller's package name if the use case is under binder IPC.

Bug: 146915889
Test: -boot, flash, boot

Change-Id: I01646fe045772c57b4e39a5e129531f8a2cea89f
Merged-In: I01646fe045772c57b4e39a5e129531f8a2cea89f
Merged-In: I2a35e1b6851e7a799c343be0dd60da23514768ba
(cherry picked from commit e09a92fabe7956692f34e94c198d9763bf76e53d)
2020-03-09 02:42:28 +00:00
Automerger Merge Worker
0a368b10bc Fix crash and duplicated ethernet tethering request
This change fix two things:
1. Handle ethernet callback in internal thread to avoid crash. IpServer
should be created from tethering thread, otherwise mIpNeighborMonitor of
IpServer would throw
   IllegalStateException("start() called from off-thread")
2. Ethernet tethering request may be duplicated if multiple
startTethering is called but no stopTethering

Bug: 130840861
Bug: 148824036
Test: ON/OFF ethernet tehtering manually
      atest TetheringTests

Change-Id: Ibd3ea6bc6751bd65647ff381f9b0124bc3395c09
Merged-In: I7c5127e96d80d077735010d2e62c7227805ccb10
Merged-In: Ibd3ea6bc6751bd65647ff381f9b0124bc3395c09
(cherry picked from commit 72702b979654234c18045f04270040056a74cf90)
2020-03-09 02:02:23 +00:00
markchien
05bee8027d Send offload status changed callback
The callback would be fired when offload started, stopped, or failed.
If offload is not supported, "failed" callback would be fired when user
enable tethering. Enabling multiple tethering would not have multiple
offload status callbacks because offload should already be started or
failed.

Bug: 130596697
Test: -build, flash, boot
      -atest TetheringTests
      -ON/OFF hotspot
Change-Id: Ia0398601144b0e5f61dc0c5771eacf13e7cfbb59
2020-03-09 01:51:20 +00:00
paulhu
08294f9c09 [TNU01] Add Tethering notification updater
There are lots of Carrier/OEM requests for tethering
notification customization. So add a new tethering notification
updater class which can let OEM customize the behavior they
wanted.

Bug: 122085773
Test: atest TetheringTests
Change-Id: I7faacde7ac84e93ea0dfe03dd33d2cc41c589225
2020-03-09 09:20:19 +08:00
Automerger Merge Worker
913579d886 Merge "Tethering: add isTetheringSupported with callerPkg parameter" am: 727c245b02 am: 7c2b86b464
Change-Id: I801efeee54476747365ff6ed665e327c254860c8
2020-03-03 12:20:52 +00:00
markchien
06ea03a6c4 Tethering: add isTetheringSupported with callerPkg parameter
BT tethering need to know whether tethering is supported for its caller
that call isTetheringSupported in binder thread under BT's process.
Current isTetheringSupported API is getting callerPkg inside
TetheringManager that would be BT's package name for bt tethering case.
Provide isTetheringSupported(String callerPkg) for caller to pass its
caller's package name if the use case is under binder IPC.

Bug: 146915889
Test: -boot, flash, boot
Change-Id: I2a35e1b6851e7a799c343be0dd60da23514768ba
2020-03-03 14:27:04 +08:00
Automerger Merge Worker
c99dc1dabc [automerger skipped] Merge "Mark updatable APEXes" am: 067c45b1ee am: b76ef78c49 -s ours
am skip reason: Change-Id Idb55300a60a261c7bb6359439ed220ff51fcf06c with SHA-1 477b4734f5 is in history

Change-Id: I43abc46bda66434d5a35afc09676d085ba8c3ea0
2020-02-29 15:36:47 +00:00
Jiyong Park
067c45b1ee Merge "Mark updatable APEXes" 2020-02-29 15:10:24 +00:00
Jiyong Park
5c72ad41f0 Mark updatable APEXes
Mark updatable APEXes as updatable: true so that they are opted-out from
optimizations that make sense only for non-updatable modules; such as
symlinking to the libs in the system partition.

Bug: 149805758
Test: m and check that there is no symlink from the APEX to the system
partition.

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: Idb55300a60a261c7bb6359439ed220ff51fcf06c
(cherry picked from commit 8201bdfab070fb2b93a997947095fad003060da9)
Change-Id: Idb55300a60a261c7bb6359439ed220ff51fcf06c
2020-02-29 09:18:24 +00:00
Automerger Merge Worker
2874282135 Merge "Fix crash and duplicated ethernet tethering request" am: 048c96276b am: d74f557cbf
Change-Id: I64f6f64c643e626380403d3e15c6ed4b5f2330ef
2020-02-28 03:04:11 +00:00