Orion Hodson
e5fdcd86a2
[automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours am: 6c0e9f46cd -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I4b94400277e38db25c76e02f66e4f5f523358452
2020-06-25 08:32:19 +00:00
Orion Hodson
6b0056827f
[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours am: 77156e6721 -s ours
...
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: I812dfa946299dc565e915dcbabe43e1d74abeb1f
2020-06-25 08:32:12 +00:00
Orion Hodson
6c0e9f46cd
[automerger skipped] Merge changes from topic "lnh-platform-split" am: c6b2c39d04 am: 9228c914d2 -s ours
...
am skip reason: Change-Id I7af128f42ae89a77a8e3fb113ea533331153c535 with SHA-1 864d304156 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: I3bb4fbb8c5c7df3f43bb69e1228848540e1249f9
2020-06-25 08:13:32 +00:00
Orion Hodson
77156e6721
[automerger skipped] Sync with libnativehelper refactoring am: 0cdccd707f am: 1309dcd8de -s ours
...
am skip reason: Change-Id Icd06e9a315680c2251dbb9032a904dd6d66aa359 with SHA-1 697ec868d2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: Ief614f159c1972c181986ae05b01b5dc2a92b1ee
2020-06-25 08:13:26 +00:00
Orion Hodson
9228c914d2
Merge changes from topic "lnh-platform-split" am: c6b2c39d04
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348764
Change-Id: Ie34095ddf885fcf57e2a7bcb89817485564e9100
2020-06-25 07:58:17 +00:00
Orion Hodson
1309dcd8de
Sync with libnativehelper refactoring am: 0cdccd707f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348763
Change-Id: I7511170930440ec5a1a8067b57a76a6c19484d71
2020-06-25 07:58:10 +00:00
Orion Hodson
c6b2c39d04
Merge changes from topic "lnh-platform-split"
...
* changes:
Update to use nativehelper/JNIPlatformHelp.h
Sync with libnativehelper refactoring
2020-06-25 07:36:05 +00:00
Orion Hodson
db4a0425f3
Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp am: 1eff58da30
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11985379
Change-Id: I2c4432fd6aebf2706b2a927842d9fb21b09dd166
2020-06-24 21:23:34 +00:00
Orion Hodson
1eff58da30
Merge "Sync with libnativehelper refactoring" into rvc-dev-plus-aosp
2020-06-24 21:02:39 +00:00
Luke Huang
8fc588f87b
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours am: 04e5539162 -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I5af3e4f7a38fa4374a568dc99925b76fc0f033a6
2020-06-24 19:12:16 +00:00
Luke Huang
04e5539162
[automerger skipped] Merge "Move DnsPacket to libs net" am: d295f3e4f4 am: 99368dec69 -s ours
...
am skip reason: Change-Id I8841d91456952ded5efbf8ea221289aecc7746ad with SHA-1 8dd7e0a936 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348582
Change-Id: I4bddd1c6f072845f1a62812995a3b4cb4299ccaa
2020-06-24 19:11:24 +00:00
Orion Hodson
0cdccd707f
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
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c4682505 )
2020-06-24 14:13:13 +01:00
Orion Hodson
697ec868d2
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
Merged-In: Icd06e9a315680c2251dbb9032a904dd6d66aa359
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit a5c4682505 )
2020-06-24 12:47:10 +00:00
Luke Huang
895594dcc2
Move DnsPacket to libs net
...
This class might be used by some mainline modules.
Bug: 151052811
Test: atest DnsPacketTest
Test: atest DnsResolverTest
(clean cherry-pick from internal branch)
Merged-In: I8841d91456952ded5efbf8ea221289aecc7746ad
Change-Id: I8841d91456952ded5efbf8ea221289aecc7746ad
2020-06-24 11:32:26 +00:00
TreeHugger Robot
3edc33cc49
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -s ours am: 5c5ee11ba0 -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: Ia4bbbe4ada4628fb18205bec5a4f66a03ba0c917
2020-06-24 06:57:17 +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
5c5ee11ba0
[automerger skipped] Merge "tethering: offload: Netlink Req" into rvc-dev am: 0de458a801 -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: Ib853e8dcf754451407ef858f3af766b9cab9696c
2020-06-24 06:50:26 +00:00
TreeHugger Robot
0de458a801
Merge "tethering: offload: Netlink Req" into rvc-dev
2020-06-24 06:46:47 +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
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
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
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
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
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
Mark Chien
f523ae5bbd
[automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours am: df63d22cbe -s ours
...
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 017bfba0d8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345357
Change-Id: I3c929eb2c80666d88ba8780b8761237b6945f308
2020-06-20 04:39:06 +00:00
markchien
e3c5268531
[automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours am: 1f5c10559b -s ours
...
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 217d7b01f8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1253710
Change-Id: Id123e9df66ca3a13dd39ff8b5c39bb2560e23863
2020-06-20 04:39:03 +00:00
Mark Chien
df63d22cbe
[automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours
...
am skip reason: Change-Id I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6 with SHA-1 017bfba0d8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345357
Change-Id: Ie251a5e4cbfc78f8b26ae32a12679dd08bd348d9
2020-06-20 04:32:35 +00:00
markchien
1f5c10559b
[automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours
...
am skip reason: Change-Id I6f23553bb1da5f0b767f920b32a86fafb9e00b9e with SHA-1 217d7b01f8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1253710
Change-Id: I259c3a257511436baac8894c7677dbd3090941ab
2020-06-20 04:32:18 +00:00
markchien
4c9428a135
Protect invalid entitlement app configuration
...
There is a protection in Settings that Settings would gray out if
tethering requires entitlement check but the entitlement app is
invalid. Tethering resource is moved from framework to tethering
module, so Settings can not fetch entitlement app name anymore.
In this change, tethering module would check whether entitltement app
package name is exsited if entitlement check is needed. Tethering would
be not supported (Settings tethering option would be hidded) if
entitlement app is not installed.
After moving the protection into tethering module,
TetherUtil#isProvisioningNeeded is no longer needed. Because The
only use case is Settings wants to gray out tethering setting
when entitltement check is needed but entitlement app is invalid.
Bug: 146918263
Test: atest TetheringCoverageTests
Change-Id: I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6
Merged-In: I9a5ff5dbc1db3f3be7fcd7146862a16b373507e6
2020-06-20 10:19:25 +08:00
markchien
902043f5c3
Pass entitlement configuration to Settings for entitlement check
...
Tethering resource configuration is move from framwork to tethering
module. Since tethering resource would not be accessible from outside
of tethering module, EntitlementManager would tell Settings the
entitlement configuration via intent extra when run entitlement check.
Bug: 146918263
Test: atest TetheringTests
Change-Id: I6f23553bb1da5f0b767f920b32a86fafb9e00b9e
Merged-In: I6f23553bb1da5f0b767f920b32a86fafb9e00b9e
2020-06-20 10:19:21 +08:00
Automerger Merge Worker
d8cdf78876
Merge "[automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca -s ours am: 962cf025d9 -s ours" into rvc-d1-dev-plus-aosp
2020-06-19 08:40:53 +00:00
TreeHugger Robot
e634bb0f0c
[automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca -s ours am: 962cf025d9 -s ours
...
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 9807816e09 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908430
Change-Id: Id6c49df1433c8210b28ac1397b72cdcf58afbbe6
2020-06-19 08:40:49 +00:00
TreeHugger Robot
693729a12c
[automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca am: ebcd7131a1 -s ours
...
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 9807816e09 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908430
Change-Id: If485617d584ccc0f27b699da095d4e1844af39dd
2020-06-19 08:40:41 +00:00
TreeHugger Robot
962cf025d9
[automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca -s ours
...
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 9807816e09 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908430
Change-Id: I6bb2a35f0f74cbd4bfe9b3a82c322c56b804d034
2020-06-19 08:28:32 +00:00
TreeHugger Robot
ebcd7131a1
Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908430
Change-Id: I2a5179ac64f00bf6a4254ded6318d6f1c6f9fd6c
2020-06-19 08:28:26 +00:00
Automerger Merge Worker
3c23410f09
Merge changes from topic "am-c6168f81c15b4bdc8b95f05dbf2b9ba8" into rvc-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 am: d8a97e64b5 -s ours
[automerger skipped] Memory leak due to no stop for IpNeighborMonitor. am: 93e59ee726 am: f56b2d478a -s ours
2020-06-19 07:02:02 +00:00