Commit Graph

2589 Commits

Author SHA1 Message Date
Mark Chien
d949606715 Merge "Let only Ethernet manage ethernet interface up and down" am: ac8445ca3b am: eb4a072814 am: 0d3aeb6139 am: 74698ef2a0 am: 6910372402
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317394

Change-Id: Ic1b5a996c60665ecbc1a5a3e29435eb65bfec475
2020-06-19 06:52:12 +00:00
Mark Chien
6910372402 Merge "Let only Ethernet manage ethernet interface up and down" am: ac8445ca3b am: eb4a072814 am: 0d3aeb6139 am: 74698ef2a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317394

Change-Id: I1bc40afe2fb72b312e493da6142fdd72e9321f84
2020-06-19 06:43:05 +00:00
Mark Chien
74698ef2a0 Merge "Let only Ethernet manage ethernet interface up and down" am: ac8445ca3b am: eb4a072814 am: 0d3aeb6139
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317394

Change-Id: I12956a86fbba41b43d1fca1f15276e2a07ef3612
2020-06-19 06:30:35 +00:00
Mark Chien
0d3aeb6139 Merge "Let only Ethernet manage ethernet interface up and down" am: ac8445ca3b am: eb4a072814
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1317394

Change-Id: Ifc233eff24c893ca542e75b683be0628eafba37f
2020-06-19 06:25:12 +00:00
Mark Chien
ac8445ca3b Merge "Let only Ethernet manage ethernet interface up and down" 2020-06-19 05:55:35 +00:00
Mark Chien
a26a8953a6 [automerger skipped] Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1 -s ours am: 83d3905afb -s ours am: 9edaafb3f1 -s ours am: 82fee063b0 -s ours
am skip reason: Change-Id I13b291e5db6a8a8c9f2bfa477acabaea250aa48c with SHA-1 a4a8a315fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: I30b04a98a02cbcec3029b5b9586eb8ad74207446
2020-06-19 05:40:40 +00:00
Mark Chien
e537efac8a [automerger skipped] Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1 am: 754b32ce5b -s ours am: e9e371bfd8 -s ours am: 40f9e23fe2 -s ours
am skip reason: Change-Id I13b291e5db6a8a8c9f2bfa477acabaea250aa48c with SHA-1 a4a8a315fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: I7d3f5640ac0ff0bf823e81a36bd546b0eb46137e
2020-06-19 05:40:23 +00:00
Mark Chien
ff1224150a [automerger skipped] Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1 am: 754b32ce5b am: 7092210efe -s ours am: f330726d31 -s ours
am skip reason: Change-Id I13b291e5db6a8a8c9f2bfa477acabaea250aa48c with SHA-1 c907a99efd is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: I2dee0e3d9e3f00f6259866e9f1be908ef8a80ce1
2020-06-19 05:30:42 +00:00
Mark Chien
82fee063b0 [automerger skipped] Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1 -s ours am: 83d3905afb -s ours am: 9edaafb3f1 -s ours
am skip reason: Change-Id I13b291e5db6a8a8c9f2bfa477acabaea250aa48c with SHA-1 a4a8a315fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: Ifa2008551f05fc317d2e42df4e28e7bc0b28ce2c
2020-06-19 05:14:04 +00:00
Mark Chien
40f9e23fe2 [automerger skipped] Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1 am: 754b32ce5b -s ours am: e9e371bfd8 -s ours
am skip reason: Change-Id I13b291e5db6a8a8c9f2bfa477acabaea250aa48c with SHA-1 a4a8a315fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: I2559fc07a48321e689af32357cdef6df1365854e
2020-06-19 05:13:33 +00:00
Mark Chien
f330726d31 [automerger skipped] Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1 am: 754b32ce5b am: 7092210efe -s ours
am skip reason: Change-Id I13b291e5db6a8a8c9f2bfa477acabaea250aa48c with SHA-1 c907a99efd is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: I7dce4209938e4455ab83dfba59effbe361f4cb2d
2020-06-19 05:13:15 +00:00
Mark Chien
9edaafb3f1 [automerger skipped] Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1 -s ours am: 83d3905afb -s ours
am skip reason: Change-Id I13b291e5db6a8a8c9f2bfa477acabaea250aa48c with SHA-1 a4a8a315fe is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: I1da5e4e9283961a587faf0938829ab22862f3958
2020-06-19 05:00:25 +00:00
Mark Chien
e9e371bfd8 [automerger skipped] Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1 am: 754b32ce5b -s ours
am skip reason: Change-Id I13b291e5db6a8a8c9f2bfa477acabaea250aa48c with SHA-1 c907a99efd is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: Icb7e02b379b343368eeb75cf44c683489267cad9
2020-06-19 05:00:04 +00:00
Mark Chien
83d3905afb [automerger skipped] Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1 -s ours
am skip reason: Change-Id I13b291e5db6a8a8c9f2bfa477acabaea250aa48c with SHA-1 c907a99efd is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: I411e7cffe6c8cb734cf800100138dd522697baa6
2020-06-19 04:43:37 +00:00
Mark Chien
754b32ce5b Merge "Add owneship of tethering module" into rvc-dev am: fb8fc4a0f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910264

Change-Id: I4600aa0f43c010efe4238f92e0e70faec93a4f22
2020-06-19 04:43:33 +00:00
Treehugger Robot
48e22cdaf9 Merge "Test that IpNeighborMonitor is stopped when IpServer stops." am: 3fd7eb2154 am: a5edc98546 am: 57c16390af am: 9508d5fc69 am: 60761234fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343441

Change-Id: Iaf97a700159eace571369defd5561c46b83f2e72
2020-06-19 03:49:04 +00:00
Milim Lee
9807816e09 Let only Ethernet manage ethernet interface up and down
When LAN link is changed for using ethernet interface from Ethernet tethering to Ethernet,
there is confiict as Ethernet Tethering is trying to make ethernet link down and Ethernet is trying to make ethernet link up.

So, this would make Ethernet only manage ethernet interface link state.

Test: manual
Bug: 130840861
Change-Id: I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc
2020-06-19 12:44:22 +09:00
Treehugger Robot
a4a8a315fe Add owneship of tethering module
Bug: 158961959
Test: build/make/tools/checkowners.py packages/NetworkStack/OWNERS
Test: ./build/make/tools/checkowners.py \
frameworks/base/packages/Tethering/OWNERS

Merged-In: I13b291e5db6a8a8c9f2bfa477acabaea250aa48c
Change-Id: I13b291e5db6a8a8c9f2bfa477acabaea250aa48c
2020-06-19 03:37:43 +00:00
Treehugger Robot
60761234fa Merge "Test that IpNeighborMonitor is stopped when IpServer stops." am: 3fd7eb2154 am: a5edc98546 am: 57c16390af am: 9508d5fc69
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343441

Change-Id: I8a78313b8d4524aa40ed6751979c4947387b7658
2020-06-19 03:34:30 +00:00
Treehugger Robot
9508d5fc69 Merge "Test that IpNeighborMonitor is stopped when IpServer stops." am: 3fd7eb2154 am: a5edc98546 am: 57c16390af
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343441

Change-Id: I5a21c01452b5d8c6163b28fa903ba154eb3ee7c0
2020-06-19 03:17:39 +00:00
Treehugger Robot
57c16390af Merge "Test that IpNeighborMonitor is stopped when IpServer stops." am: 3fd7eb2154 am: a5edc98546
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343441

Change-Id: Iddcf13599efd093b2cf2d2228a3f7be69178e5fc
2020-06-19 03:04:46 +00:00
Treehugger Robot
3fd7eb2154 Merge "Test that IpNeighborMonitor is stopped when IpServer stops." 2020-06-19 02:36:06 +00:00
Automerger Merge Worker
48fa231a61 Merge "Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb am: 5689772f4d am: 83b8721991" into rvc-qpr-dev-plus-aosp am: dfa0dd7f97
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I595a75842a27ffa346a362a70b53272f08fc514b
2020-06-19 01:59:41 +00:00
Remi NGUYEN VAN
6320c8ff32 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb am: 5689772f4d am: 448560b25b am: 45fd6d0d23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: If0d6cd6257893f05d17ee972190c3a2aedb12085
2020-06-19 01:58:32 +00:00
Remi NGUYEN VAN
ffcec4326b Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb am: 2e342b8676 am: f991e518b7 am: c7e93bbdcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I9791fe78ecbe5c91f00225c13db7f9ed9f5823d4
2020-06-19 01:57:56 +00:00
Automerger Merge Worker
dfa0dd7f97 Merge "Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb am: 5689772f4d am: 83b8721991" into rvc-qpr-dev-plus-aosp 2020-06-19 01:41:35 +00:00
Remi NGUYEN VAN
83fd51e56e Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb am: 5689772f4d am: 83b8721991
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I79af90ded28a5bbc3f607f50947fda21fe613c34
2020-06-19 01:41:22 +00:00
Remi NGUYEN VAN
45fd6d0d23 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb am: 5689772f4d am: 448560b25b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I50b32efed3d5398346450c34afc45c6e6ab3d9f3
2020-06-19 01:41:07 +00:00
Remi NGUYEN VAN
c7e93bbdcf Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb am: 2e342b8676 am: f991e518b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Ia943e2cdc74480ea0bbbd07478befaeefac97189
2020-06-19 01:40:35 +00:00
Remi NGUYEN VAN
83b8721991 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb am: 5689772f4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I2ec211557839533327cc747857a09bd323654ad6
2020-06-19 01:22:47 +00:00
Remi NGUYEN VAN
f991e518b7 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb am: 2e342b8676
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: I17459fc7a4239b10b6b55412d126557719e1bd98
2020-06-19 01:22:28 +00:00
Remi NGUYEN VAN
2e342b8676 Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Icd141a992c46290c74929785e261a1cd57bc001b
2020-06-19 01:08:48 +00:00
Remi NGUYEN VAN
5689772f4d Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: e7afe55beb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11846903

Change-Id: Ia5028f7dfeadbcf928efb9862b481c82e2849e18
2020-06-19 01:08:47 +00:00
Remi NGUYEN VAN
e7afe55beb Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev 2020-06-19 00:49:29 +00:00
Automerger Merge Worker
b2693aadc9 Merge "Merge "Memory leak due to no stop for IpNeighborMonitor." am: 4cc7532355 am: 1e488831bd" into rvc-dev-plus-aosp am: 6a952e4f88 am: 174565a6e4 am: 5fe774d267
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343440

Change-Id: I9c094ae365e5f0e5aa1cae332faed7956e897d82
2020-06-18 18:06:50 +00:00
Lorenzo Colitti
345f312605 Merge "Move DnsPacket to libs net" into rvc-dev am: 52032fa586 am: 0715560195 am: c84ea969bc am: 275ab7484f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: I622b154339c58e7ab6c16909e754b8c113c10b8e
2020-06-18 17:14:52 +00:00
Lorenzo Colitti
c12a0aa4d2 Merge "Move DnsPacket to libs net" into rvc-dev am: 52032fa586 am: 0715560195 am: c0cd967d5d am: 26978a9f6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: Ic0a9258331be8f3d4a4fa69a8f9f8aa03dde1e6b
2020-06-18 17:10:44 +00:00
Automerger Merge Worker
5fe774d267 Merge "Merge "Memory leak due to no stop for IpNeighborMonitor." am: 4cc7532355 am: 1e488831bd" into rvc-dev-plus-aosp am: 6a952e4f88 am: 174565a6e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343440

Change-Id: I0fa81701ecb97cb86b695bac72e310acce7681e9
2020-06-18 17:06:14 +00:00
TreeHugger Robot
61b8c582c0 [automerger skipped] Merge "[BOT.13] Make offload coordinator poll interval configurable" into rvc-dev am: 6fddfb71e4 am: 4e994788db -s ours am: dc472ef772 -s ours am: 48c43c36ba -s ours
am skip reason: Change-Id I7f8dde3b57ee14eb33edbe2fd383df33cccc231c with SHA-1 bfdcfe4ecd is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882405

Change-Id: Id3d82702d74144a277203a55783b6f826e135f62
2020-06-18 16:56:48 +00:00
TreeHugger Robot
3ecdc0b8fc [automerger skipped] Merge "[BOT.12] Add unit test for disabling BpfCoordinator by config" into rvc-dev am: 3358560be8 am: 8fd0b8bcf2 -s ours am: 3caed31afc -s ours am: dfd01604c0 -s ours
am skip reason: Change-Id Iedb936b7592b6be773d1b84a2498bfc5a440a198 with SHA-1 8b3af8d775 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883504

Change-Id: Id877d14347a1c58cf361d5040690e7bb8bff1207
2020-06-18 16:56:36 +00:00
TreeHugger Robot
0d275d4f45 [automerger skipped] Merge changes I48a8de47,I95ea3050,I5a98c4cd into rvc-dev am: ec5a703838 am: 744e7cd238 -s ours am: 3425b6bf39 -s ours am: d5576fdd0a -s ours
am skip reason: Change-Id Id413b7f2f7edb2e5c3e02d5677fe536ed52fbbcb with SHA-1 519f1201ca is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11892958

Change-Id: I31494aae70c75ded8578afcefc030d51d8e8b826
2020-06-18 16:56:23 +00:00
Nucca Chen
606f150dc0 [automerger skipped] [BOT.8] Dump BPF offload information in dumpsys am: a340f25d3e am: 9d19ebf408 -s ours am: 63df5ec43a -s ours am: c34bb396ec -s ours
am skip reason: Change-Id I95ea3050d92f3ba8136a63cd399d3450d183c8dc with SHA-1 a340f25d3e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882881

Change-Id: Idaa8394f8e30e540b1d091e0bebdc5c21b234128
2020-06-18 16:56:18 +00:00
Nucca Chen
64eedeb612 [automerger skipped] [BOT.10] Add unit test for data limit and rule change in BpfCoordinator am: 2fbc671d4a am: f7257aaec8 -s ours am: bc63b4f34d -s ours am: 277efa496d -s ours
am skip reason: Change-Id I5a98c4cd74e2de6005ee05defa761f6af3fd4e75 with SHA-1 2fbc671d4a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882403

Change-Id: If3eefbfc06b46e0a871f753512900144abb83d22
2020-06-18 16:56:14 +00:00
Automerger Merge Worker
174565a6e4 Merge "Merge "Memory leak due to no stop for IpNeighborMonitor." am: 4cc7532355 am: 1e488831bd" into rvc-dev-plus-aosp am: 6a952e4f88
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343440

Change-Id: I14876fb85a36c34b62429c509389da1e0aa5e984
2020-06-18 16:49:19 +00:00
Lorenzo Colitti
51229ef8f0 Merge "Memory leak due to no stop for IpNeighborMonitor." am: 4cc7532355 am: 1e488831bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343440

Change-Id: Idef540bd66d193eb9b7071374736633c7d0323d7
2020-06-18 16:36:32 +00:00
Automerger Merge Worker
64695cd148 Merge "Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 0382ca9dc1 am: 18e59cdc1d" into rvc-qpr-dev-plus-aosp am: cb1bfbbca6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350

Change-Id: I4ffa11d2809db57f3a0ed0354a0a782f55be3dd0
2020-06-18 16:01:19 +00:00
Automerger Merge Worker
4ae8336a5f Merge "Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 0382ca9dc1 am: c50a851e80" into rvc-qpr-dev-plus-aosp am: 552a6ecc23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350

Change-Id: I90e56fcbc798ac2d881ace5b93ae7111e2a71552
2020-06-18 16:00:27 +00:00
Lorenzo Colitti
4cc7532355 Merge "Memory leak due to no stop for IpNeighborMonitor." 2020-06-18 15:57:01 +00:00
Lorenzo Colitti
275ab7484f Merge "Move DnsPacket to libs net" into rvc-dev am: 52032fa586 am: 0715560195 am: c84ea969bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: Ia864febe574f607767a39fc6df99f114e242c304
2020-06-18 15:31:23 +00:00
Lorenzo Colitti
26978a9f6a Merge "Move DnsPacket to libs net" into rvc-dev am: 52032fa586 am: 0715560195 am: c0cd967d5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862407

Change-Id: If3773200c63930e21cab018b3322c3dda42ba6f9
2020-06-18 15:28:46 +00:00