Automerger Merge Worker
ae7c8cd88e
Merge "[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours am: 95ba1d0661 -s ours" into rvc-qpr-dev-plus-aosp am: 0cbcd310f9 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 e8141aa9c3 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I3fc45274c9340cd012be1397d2d4c30874f17582
2020-06-24 07:28:12 +00:00
TreeHugger Robot
23352a27dd
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 am: 0034558936 -s ours am: 28dd8439d1 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: Ic7c7b95ec519d9a4acd776b6e659ec7c2aa604c8
2020-06-24 07:27:48 +00:00
Automerger Merge Worker
0cbcd310f9
Merge "[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours am: 95ba1d0661 -s ours" into rvc-qpr-dev-plus-aosp
2020-06-24 07:11:41 +00:00
TreeHugger Robot
c618e50209
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours am: 95ba1d0661 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I543c3d4be2acf9445cdf9faae132357fc1892f66
2020-06-24 07:11:30 +00:00
TreeHugger Robot
28dd8439d1
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 am: 0034558936 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I928f83a54814438cf1095f1d3506c05f4346f97d
2020-06-24 07:11:26 +00:00
TreeHugger Robot
95ba1d0661
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 am: 91d1d07ff4 -s ours
...
am skip reason: Change-Id Iaf3e847e92f205b55f10fa85c17b9f3995d52099 with SHA-1 6b94c31626 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: Ib4ece60f5283898764ffd23aea615060e2dbe348
2020-06-24 06:56:48 +00:00
TreeHugger Robot
91d1d07ff4
Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11970745
Change-Id: I70a9139123e5703607e2c011c7449e37880e78d5
2020-06-24 06:51:09 +00:00
TreeHugger Robot
0de458a801
Merge "tethering: offload: Netlink Req" into rvc-dev
2020-06-24 06:46:47 +00:00
Orion Hodson
869fc73ad0
Merge changes from topic "lnh-platform-split"
...
* changes:
Sync with libnativehelper refactoring
Update to use nativehelper/JNIPlatformHelp.h
2020-06-24 06:18:23 +00:00
Automerger Merge Worker
6960653405
Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 -s ours am: fdb754c00d -s ours am: 5e02e65a89 -s ours" into rvc-qpr-dev-plus-aosp am: 4d81e32375 -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 4dd87aafc0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I022f18297d6034e40c3a88649ebb43d87bb6d446
2020-06-24 05:16:50 +00:00
Automerger Merge Worker
ef2b1f636f
Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 96a0513a90 am: aa1630d0b7 -s ours" into rvc-qpr-dev-plus-aosp am: 44c1385bdd -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 4dd87aafc0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: Ib0a2326956c0541fd0f30dd118af19324a86d6be
2020-06-24 05:16:21 +00:00
Lorenzo Colitti
e2f94341da
[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 96a0513a90 -s ours am: f201a04a2c -s ours am: c5bdedcff0 -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I1f2aeee2fa48978901396c10e2da2f354b354521
2020-06-24 05:16:03 +00:00
Automerger Merge Worker
4d81e32375
Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 -s ours am: fdb754c00d -s ours am: 5e02e65a89 -s ours" into rvc-qpr-dev-plus-aosp
2020-06-24 05:04:39 +00:00
Lorenzo Colitti
fc544e124e
[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 -s ours am: fdb754c00d -s ours am: 5e02e65a89 -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 4dd87aafc0 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: Id0ec10858c339441ffbe6b2f7d4a204f645c3733
2020-06-24 05:04:33 +00:00
Automerger Merge Worker
44c1385bdd
Merge "[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 96a0513a90 am: aa1630d0b7 -s ours" into rvc-qpr-dev-plus-aosp
2020-06-24 05:04:31 +00:00
Lorenzo Colitti
ccd593c15c
[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 96a0513a90 am: aa1630d0b7 -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I88c121b4cdf4449b5bef1aa215d588010ee2f4de
2020-06-24 05:04:20 +00:00
Lorenzo Colitti
c5bdedcff0
[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 96a0513a90 -s ours am: f201a04a2c -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I5b1f4d085dcca1e9a25a1530d9dac019b41dc88b
2020-06-24 05:04:15 +00:00
Lorenzo Colitti
5e02e65a89
[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 -s ours am: fdb754c00d -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I1ce91e52fad77b3a546dedea8034cba442c618a4
2020-06-24 04:53:31 +00:00
Lorenzo Colitti
f201a04a2c
[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 am: 96a0513a90 -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I02ca5d4528ad443c6498c9d5b14adfa850cbd42f
2020-06-24 04:53:23 +00:00
Lorenzo Colitti
96a0513a90
Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I6ceddc20bdec83e23039b9566187c3cbaff79176
2020-06-24 04:41:15 +00:00
Lorenzo Colitti
fdb754c00d
[automerger skipped] Merge "Tethering: Add WiGig support" into rvc-dev am: 7852107b29 -s ours
...
am skip reason: Change-Id Ic4d3aca0ed69234093af7f0206dab3335938c52a with SHA-1 6896f6193f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953638
Change-Id: I972b6d352b2c65f023b6a5239a32e9bfec573472
2020-06-24 04:40:39 +00:00
Lorenzo Colitti
925f8f07b3
Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0 am: 4d2944cda4 am: ee131d4c64 am: 52116b6880
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954
Change-Id: I414456f814a807a0a38cceb50164b6468adc2d10
2020-06-24 04:24:45 +00:00
Lorenzo Colitti
e8141aa9c3
tethering: offload: Netlink Req
...
Send netlink request over fd for offload config before
completing init sequence. Provides existing conntrack
entries to IPA. Resolves issue where there are NAT
misses in IPA due to IPA only having the conntrack
entries added after tethering starts.
Bug: 149109043
Test: OffloadHardwareInterfaceTest
Original-Change: https://android-review.googlesource.com/1290954
Merged-In: Iaf3e847e92f205b55f10fa85c17b9f3995d52099
Change-Id: Iaf3e847e92f205b55f10fa85c17b9f3995d52099
2020-06-24 04:21:47 +00:00
Lorenzo Colitti
52116b6880
Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0 am: 4d2944cda4 am: ee131d4c64
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954
Change-Id: I6f6f6c437c989bce10c9dad1d1fa6ed395296649
2020-06-24 04:07:02 +00:00
Lorenzo Colitti
ee131d4c64
Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0 am: 4d2944cda4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954
Change-Id: I13fb2f296c8c026619e817e5fd8a16098d1dcc6c
2020-06-24 03:51:47 +00:00
Lorenzo Colitti
4d2944cda4
Merge "tethering: offload: Netlink Req" am: b90c974174 am: d45fd82ad0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1290954
Change-Id: I5f976d70d87ef25ebb8e1483532781ac3d42425b
2020-06-24 03:44:31 +00:00
Lorenzo Colitti
b90c974174
Merge "tethering: offload: Netlink Req"
2020-06-24 03:11:26 +00:00
Orion Hodson
a5c4682505
Sync with libnativehelper refactoring
...
jniGetFDFromFileDescriptor() is now a legacy method and moved to a
separate header.
Bug: 151443957
Bug: 158749603
Test: m
Change-Id: Icd06e9a315680c2251dbb9032a904dd6d66aa359
2020-06-23 11:50:26 +01:00
Mark Chien
93743bb990
Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb am: 45fa4f9c88 am: 5131fee94b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323
Change-Id: I2d3971390e897be6669d2f2d4b261eb73875c267
2020-06-23 00:09:17 +00:00
Mark Chien
5131fee94b
Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb am: 45fa4f9c88
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323
Change-Id: I4ee9d7c35c96e8632526184dd53c1206d8ba8f3f
2020-06-23 00:01:46 +00:00
Mark Chien
45fa4f9c88
Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803 am: fdf89ee7fb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323
Change-Id: Ib53b8bb0f325661ed1919978220b3a4a503b9ae8
2020-06-22 23:45:04 +00:00
Mark Chien
fdf89ee7fb
Merge "Tethering: Add WiGig support" am: 65fadfc134 am: 6c5b5b0803
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1177323
Change-Id: Ib48182d51cc6e4586cb43f8ca51ea673ee14d1d7
2020-06-22 23:43:43 +00:00
Dedy Lansky
4dd87aafc0
Tethering: Add WiGig support
...
This change is a combination of following changes:
1) Tethering: add TETHERING_WIGIG type
Currently both WIFI and WIGIG use the same tethering type,
TETHERING_WIFI. This causes conflicts between the frameworks,
when both WIFI and WIGIG SoftAPs are started, one or both will
not work.
Fix this by using a seperate tethering type for WIGIG.
2) Tethering: remove TETHERING_WIGIG state machine on interface down
The wigig state machine relies on a TETHERING_STATE_CHANGED broadcast
that is sent when the tethering state machine is first created, during
interface up. Currently the tethering state machine is not removed
on interface down except for TETHERING_BLUETOOTH, and as a result
wigig tethering only works the first time SoftAP is started.
In order to fix this, remove the tethering state machine on interface
down for TETHERING_WIGIG as well.
Bug: 143356416
Test: TetheringCoverageTests
Change-Id: Ic4d3aca0ed69234093af7f0206dab3335938c52a
Merged-In: Ic4d3aca0ed69234093af7f0206dab3335938c52a
2020-06-22 23:23:25 +00:00
Dedy Lansky
6896f6193f
Tethering: Add WiGig support
...
This change is a combination of following changes:
1) Tethering: add TETHERING_WIGIG type
Currently both WIFI and WIGIG use the same tethering type,
TETHERING_WIFI. This causes conflicts between the frameworks,
when both WIFI and WIGIG SoftAPs are started, one or both will
not work.
Fix this by using a seperate tethering type for WIGIG.
2) Tethering: remove TETHERING_WIGIG state machine on interface down
The wigig state machine relies on a TETHERING_STATE_CHANGED broadcast
that is sent when the tethering state machine is first created, during
interface up. Currently the tethering state machine is not removed
on interface down except for TETHERING_BLUETOOTH, and as a result
wigig tethering only works the first time SoftAP is started.
In order to fix this, remove the tethering state machine on interface
down for TETHERING_WIGIG as well.
Bug: 143356416
Test: TetheringCoverageTests
Change-Id: Ic4d3aca0ed69234093af7f0206dab3335938c52a
2020-06-22 21:17:46 +08:00
Automerger Merge Worker
cfdacf32f9
Merge "Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: c90944895f" into rvc-qpr-dev-plus-aosp am: c4956241fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: If4fde181600aa1f1d3ea0237fd76b2f6ca208b8c
2020-06-22 09:31:36 +00:00
Wayne Ma
3b0270d9fc
Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 31b6461408 am: ffdf42bc64 am: 9b00e3449c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: Id68ba2f6a1b4b941b70c73f9e51b06f8d8353b03
2020-06-22 09:31:09 +00:00
Wayne Ma
3b775c82bd
Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: a896f25304 am: 827aab1906
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: If7ceba040765291a499d8d2f04075acceeff2401
2020-06-22 09:30:54 +00:00
Automerger Merge Worker
c4956241fb
Merge "Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: c90944895f" into rvc-qpr-dev-plus-aosp
2020-06-22 09:18:01 +00:00
Wayne Ma
9b00e3449c
Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 31b6461408 am: ffdf42bc64
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: I93edd058819a5bd584f11d772661f2e0c0e01e67
2020-06-22 09:17:53 +00:00
Wayne Ma
d344a6efe5
Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: c90944895f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: I96c9559551c9ecb0e9d3a8d8c9ef5ab036b1919c
2020-06-22 09:17:44 +00:00
Wayne Ma
827aab1906
Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248 am: a896f25304
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: I7103b19f0352879595f05f08fe19df82ce5b411a
2020-06-22 09:17:43 +00:00
Wayne Ma
ffdf42bc64
Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 31b6461408
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: Ib6cc939508bacb6771a8022de7733530a241f8f5
2020-06-22 09:09:16 +00:00
Wayne Ma
a896f25304
Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359 am: 4b0912d248
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: I39dec2d8f085dc8aeb93387bc3cdd36fd25d7000
2020-06-22 09:03:59 +00:00
Wayne Ma
31b6461408
Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: I81e0304f0560cbd070c5bb49967a8b6bf3e5d58a
2020-06-22 08:51:46 +00:00
Wayne Ma
4b0912d248
Merge "Add framework-statsd dependency and make framework-statsd visible to Tethering package." into rvc-dev am: 7ce578a359
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11926261
Change-Id: If4a423ffe3cdd4f0f615aace774e2606deada766
2020-06-22 08:51:43 +00:00
waynema
b7048af0a9
Add framework-statsd dependency and make framework-statsd visible to
...
Tethering package.
Tethering needs StatsEvent and StatsLog which are in
framework-statsd.stubs.module_lib to write metrics.
Bug: 153942334
Test: make
Change-Id: I8ba142a9b3678de36e6c4880a64e992e00680f38
2020-06-22 06:57:51 +00:00
Remi NGUYEN VAN
419b298d6f
Merge "Use unstable networkstack AIDLs in development branches" into rvc-dev-plus-aosp am: 6534f90a6c am: fa4f5aa996 am: 8a0acb5335
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863640
Change-Id: I03e05b0c7200ce0daa5e11ba4caa00d19a89f6cc
2020-06-22 05:06:33 +00:00
Remi NGUYEN VAN
8a0acb5335
Merge "Use unstable networkstack AIDLs in development branches" into rvc-dev-plus-aosp am: 6534f90a6c am: fa4f5aa996
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863640
Change-Id: I214309f201c0c7ed9a71eeb6ff2656055c72b72d
2020-06-22 04:55:36 +00:00
Remi NGUYEN VAN
fa4f5aa996
Merge "Use unstable networkstack AIDLs in development branches" into rvc-dev-plus-aosp am: 6534f90a6c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11863640
Change-Id: I85837943c4dd9e5119a7457cae1a02dc6e0a2c2b
2020-06-22 04:46:10 +00:00
Remi NGUYEN VAN
6534f90a6c
Merge "Use unstable networkstack AIDLs in development branches" into rvc-dev-plus-aosp
2020-06-22 04:32:42 +00:00