Commit Graph

1530 Commits

Author SHA1 Message Date
Automerger Merge Worker
c0fb2d0a70 [automerger skipped] Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b94 -s ours am: d98059ce5c -s ours am: 773549aef6 -s ours
am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 230178c6af is in history

Change-Id: I547216283f1d2d765548db71b35fdad26783da35
2020-03-09 06:05:24 +00:00
Automerger Merge Worker
e9ead4f879 Merge "[automerger skipped] Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b94 am: 4167b495e0 -s ours am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 03a734f352 is in history" into rvc-d1-dev-plus-aosp am: 716185e110 -s ours
am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 03a734f352 is in history

Change-Id: Ib7f2d74af78eb524df366db33dc53d81c073b1a2
2020-03-09 06:04:56 +00:00
Automerger Merge Worker
8c6c75bdde Merge "Merge the following changes to tethering:" into rvc-dev am: 888d833d11 am: 2b9a5102a4
Change-Id: Ia03d9b80947fcaa8ec94822036b3173772de4ce6
2020-03-09 05:46:41 +00:00
Automerger Merge Worker
773549aef6 [automerger skipped] Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b94 -s ours am: d98059ce5c -s ours
am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 230178c6af is in history

Change-Id: I8291a6eed51fd239abf7f82c4f0f6bd9dda6e4b2
2020-03-09 05:46:34 +00:00
Automerger Merge Worker
3e41e23e91 [automerger skipped] Merge "Support losing the upstream in IpServerTest." into rvc-dev am: 3b0a1b9b94 am: 4167b495e0 -s ours
am skip reason: Change-Id I7cfc32d072f23644159d33700d6cd830c426ea19 with SHA-1 03a734f352 is in history

Change-Id: Ib5b301b93930da71b1ee861d453ffb40d77c36c5
2020-03-09 05:46:27 +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
cf8f577ce5 Merge "Send offload status changed callback" am: a24b188455 am: 1a762405b2 am: bb7d0ce5f4 am: 965e7aaa99
Change-Id: I7b3a4429e54a496f06cc9b6d747408922adc444d
2020-03-09 03:47:13 +00:00
Automerger Merge Worker
965e7aaa99 Merge "Send offload status changed callback" am: a24b188455 am: 1a762405b2 am: bb7d0ce5f4
Change-Id: If16659fc6fc560bd96a68ed54317ec58a4987d4c
2020-03-09 03:32:55 +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
8e2ed116c1 Merge "Tethering: add isTetheringSupported with callerPkg parameter" am: 727c245b02 am: 7c2b86b464 am: 913579d886 am: e43df495d5
Change-Id: I3b925c96ce74b548e4c5bef1932a740d5d4bedc7
2020-03-03 12:38:40 +00:00
Automerger Merge Worker
e43df495d5 Merge "Tethering: add isTetheringSupported with callerPkg parameter" am: 727c245b02 am: 7c2b86b464 am: 913579d886
Change-Id: Id210fdffa44e6532a04ce7cd9bcad3386fb70b9d
2020-03-03 12:21:26 +00: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
c815d2a1af [automerger skipped] Merge "Mark updatable APEXes" am: 067c45b1ee am: b76ef78c49 -s ours am: c99dc1dabc -s ours am: db6093aca9 -s ours
am skip reason: Change-Id Idb55300a60a261c7bb6359439ed220ff51fcf06c with SHA-1 477b4734f5 is in history

Change-Id: I71cdacf734a040878e445d02b2a3d125bf8c6a93
2020-02-29 16:06:55 +00:00
Automerger Merge Worker
db6093aca9 [automerger skipped] Merge "Mark updatable APEXes" am: 067c45b1ee am: b76ef78c49 -s ours am: c99dc1dabc -s ours
am skip reason: Change-Id Idb55300a60a261c7bb6359439ed220ff51fcf06c with SHA-1 477b4734f5 is in history

Change-Id: Id9d2f7bbf8a8b264f8892ebc47cdc6ca92312c03
2020-02-29 15:51:33 +00: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
6eb4438f1b Merge "Fix crash and duplicated ethernet tethering request" am: 048c96276b am: d74f557cbf am: 2874282135 am: d96756db69
Change-Id: If4ca231cb9c6e890836664c804487e50cb9ab88e
2020-02-28 03:27:39 +00:00
Automerger Merge Worker
d96756db69 Merge "Fix crash and duplicated ethernet tethering request" am: 048c96276b am: d74f557cbf am: 2874282135
Change-Id: I36a74a8725e5c6b6b7d471d0414cef7c316119a1
2020-02-28 03:15:16 +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
Automerger Merge Worker
8d40b09dfa Merge "Merge "Mark updatable APEXes" into rvc-dev am: 1131b744f0 am: c4f0059d08" into rvc-d1-dev-plus-aosp am: f7cd31881d
Change-Id: I1b7892f772f98b3c3521b541c7115594f0f22a4d
2020-02-28 02:55:10 +00:00
Automerger Merge Worker
0e72a3ba85 Merge "Mark updatable APEXes" into rvc-dev am: 1131b744f0 am: 522e2529c1 am: d6f1cd4b52
Change-Id: I73d2df8c79f6f3781690cf8ccf7d8982f73a5d32
2020-02-28 02:54:37 +00:00
Automerger Merge Worker
36022915d6 Merge "Mark updatable APEXes" into rvc-dev am: 1131b744f0 am: c4f0059d08
Change-Id: I4054d657837bcf38be3695050f25be508e8fc3c3
2020-02-28 02:44:38 +00:00
Automerger Merge Worker
d6f1cd4b52 Merge "Mark updatable APEXes" into rvc-dev am: 1131b744f0 am: 522e2529c1
Change-Id: I8615ac73ca47db5069a72198e52035d1e94d8825
2020-02-28 02:44:18 +00:00
Lorenzo Colitti
048c96276b Merge "Fix crash and duplicated ethernet tethering request" 2020-02-28 02:37:45 +00:00
Automerger Merge Worker
c4f0059d08 Merge "Mark updatable APEXes" into rvc-dev am: 1131b744f0
Change-Id: I09b30f44fd9517ad436705d175f8f57ea70acc2c
2020-02-28 02:28:18 +00:00
TreeHugger Robot
1131b744f0 Merge "Mark updatable APEXes" into rvc-dev 2020-02-28 02:05:04 +00:00
markchien
3849d89111 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: I7c5127e96d80d077735010d2e62c7227805ccb10
2020-02-27 14:50:16 +08:00
Automerger Merge Worker
a993425dee Merge "[automerger skipped] Merge "tethering: transitive deps from jni_libs" into rvc-dev am: c46bf0786c am: 0707480414 am: 6b01f7cc87 -s ours am skip reason: Change-Id Icba6ea3611c443cbf22ad6363d0239377d16ac9e with SHA-1 cfea439ba4 is in history" into rvc-qpr-dev-plus-aosp 2020-02-26 14:49:04 +00:00
Automerger Merge Worker
d7360492ce [automerger skipped] Merge "tethering: transitive deps from jni_libs" into rvc-dev am: c46bf0786c am: 0707480414 am: 6b01f7cc87 -s ours
am skip reason: Change-Id Icba6ea3611c443cbf22ad6363d0239377d16ac9e with SHA-1 cfea439ba4 is in history

Change-Id: I1f16aee965df893bc595bde2239d5cf9b68463c9
2020-02-26 14:48:58 +00:00
Automerger Merge Worker
4912e7d71e [automerger skipped] Merge "tethering: transitive deps from jni_libs" into rvc-dev am: c46bf0786c -s ours am: 3bf6a35f7b -s ours am: 1685240d85 -s ours
am skip reason: Change-Id Icba6ea3611c443cbf22ad6363d0239377d16ac9e with SHA-1 cfea439ba4 is in history

Change-Id: I1191b9bc04c503a7f53e101b1e25fc6291034373
2020-02-26 14:48:56 +00:00
Automerger Merge Worker
1685240d85 [automerger skipped] Merge "tethering: transitive deps from jni_libs" into rvc-dev am: c46bf0786c -s ours am: 3bf6a35f7b -s ours
am skip reason: Change-Id Icba6ea3611c443cbf22ad6363d0239377d16ac9e with SHA-1 cfea439ba4 is in history

Change-Id: Ie025a4d1e3dd428030416dbe8525cb8bca02e7ee
2020-02-26 14:37:57 +00:00
Automerger Merge Worker
3bf6a35f7b [automerger skipped] Merge "tethering: transitive deps from jni_libs" into rvc-dev am: c46bf0786c -s ours
am skip reason: Change-Id Icba6ea3611c443cbf22ad6363d0239377d16ac9e with SHA-1 cfea439ba4 is in history

Change-Id: I0a1f60088d6400d2a6ab681e8e9cb3ec260a8f41
2020-02-26 14:16:27 +00:00
Jooyung Han
81675e2d94 tethering: transitive deps from jni_libs
The build system collects transtive deps from jni_libs for APKs.
No need to list them explicitly in android_app definition.

Bug: 146992436
Test: m com.android.tethering
      deapexer extract com.android.tethering.apex apex
      unzip apex/priv-app/Tethering/Tethering.apk -u apk
      ls apk/lib/arm64-v8a

Merged-In: Icba6ea3611c443cbf22ad6363d0239377d16ac9e
Change-Id: Icba6ea3611c443cbf22ad6363d0239377d16ac9e
(cherry picked from commit 9618b66f285ad5baa50b004b788d60272958a04d)
2020-02-26 14:14:17 +09:00
Automerger Merge Worker
975e463756 Merge "tethering: transitive deps from jni_libs" am: 02dd6fdfd3 am: 0c1e585a7d am: 6526779a05 am: 869f891496
Change-Id: I20f662a2049b33ee5d10413bd85d9330180de91c
2020-02-25 23:09:43 +00:00
Automerger Merge Worker
869f891496 Merge "tethering: transitive deps from jni_libs" am: 02dd6fdfd3 am: 0c1e585a7d am: 6526779a05
Change-Id: Ia35086dd7e153c4af0e6c84d0dbac55e443df393
2020-02-25 22:49:18 +00:00
Automerger Merge Worker
6526779a05 Merge "tethering: transitive deps from jni_libs" am: 02dd6fdfd3 am: 0c1e585a7d
Change-Id: I34a519885aaeb327b21569af291e10763fb48625
2020-02-25 22:38:24 +00:00
Treehugger Robot
02dd6fdfd3 Merge "tethering: transitive deps from jni_libs" 2020-02-25 22:13:19 +00:00
Automerger Merge Worker
a3582d9231 [automerger skipped] Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca29 -s ours am: 2414da664a -s ours am: c660e4c7ce -s ours
am skip reason: Change-Id Id6051296a02060179666b67fc6ea9092273c1780 with SHA-1 5650a2bcce is in history

Change-Id: Ic2c48a5879903186a74003ec83d65133044d31a4
2020-02-25 15:37:15 +00:00
Automerger Merge Worker
d8c8dce8d6 [automerger skipped] Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca29 am: b42d60fd69 -s ours am: 7a1bcc395c -s ours
am skip reason: Change-Id Id6051296a02060179666b67fc6ea9092273c1780 with SHA-1 5650a2bcce is in history

Change-Id: Ia952c2d882b336a2fa0266f9ea3c9f9c769ef30c
2020-02-25 15:36:26 +00:00
Automerger Merge Worker
d11cc27b96 [automerger skipped] Merge "Build framework-tethering against module_current" into rvc-dev am: aba5f0ca29 am: b42d60fd69 am: b51bef45bb -s ours
am skip reason: Change-Id Iad504f0e709daadfb4d86205c07f0faf429f5a8f with SHA-1 9e0792f8dc is in history

Change-Id: I8301d38008fc5e8e37e8c35a85d018f7544ee283
2020-02-25 15:35:06 +00:00