Automerger Merge Worker
d3ea14b39f
[automerger skipped] Merge changes from topic "am-0f53dad1f009493ea42909cd982cb371" into rvc-qpr-dev-plus-aosp am: 1f765af2d8 -s ours
...
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 9644bc01dd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: I2fb71a62012b552f56b3fa0935801a3950c2e14c
2020-06-19 07:24:25 +00:00
Automerger Merge Worker
f16e770721
[automerger skipped] Merge changes from topic "am-c6168f81c15b4bdc8b95f05dbf2b9ba8" into rvc-d1-dev-plus-aosp am: 3c23410f09 -s ours am: f326d9de7b -s ours
...
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 9644bc01dd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: If5412dd79954536f3b2d903ff0e3d5eaa40f35b1
2020-06-19 07:23:52 +00:00
TreeHugger Robot
462bf5477c
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 -s ours am: b207e9c9de -s ours am: f170953343 -s ours am: 8a513e070e -s ours
...
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 00ea6cecd8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: Ie4299cfa86d76b1c47476863f36b7c23718f7c7f
2020-06-19 07:23:17 +00:00
Automerger Merge Worker
1f765af2d8
Merge changes from topic "am-0f53dad1f009493ea42909cd982cb371" into rvc-qpr-dev-plus-aosp
...
* changes:
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 am: d8a97e64b5 am: d861765f0e -s ours
[automerger skipped] Memory leak due to no stop for IpNeighborMonitor. am: 93e59ee726 am: f56b2d478a am: ebc04eff8c -s ours
2020-06-19 07:10:43 +00:00
TreeHugger Robot
c3262bd1a5
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 am: d8a97e64b5 am: d861765f0e -s ours
...
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 9644bc01dd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: I969dcaa3bfd88f5cda6abd8f30f24ff34bbd396f
2020-06-19 07:10:26 +00:00
Automerger Merge Worker
f326d9de7b
[automerger skipped] Merge changes from topic "am-c6168f81c15b4bdc8b95f05dbf2b9ba8" into rvc-d1-dev-plus-aosp am: 3c23410f09 -s ours
...
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 9644bc01dd is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: I8d988f570bd067b2b9bf2b2d1269c5c47ac88067
2020-06-19 07:10:24 +00:00
Lorenzo Colitti
f4e3b16ece
[automerger skipped] Memory leak due to no stop for IpNeighborMonitor. am: 93e59ee726 am: f56b2d478a am: ebc04eff8c -s ours
...
am skip reason: Change-Id I8f60c13706f05306e8f25a15f7861d7ecabbc10e with SHA-1 93e59ee726 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910263
Change-Id: I6002c756e5caa1e1dd96253f292523b505bb1401
2020-06-19 07:10:22 +00:00
TreeHugger Robot
8a513e070e
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 -s ours am: b207e9c9de -s ours am: f170953343 -s ours
...
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 00ea6cecd8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: I4e7337e71480319a7dab68d89d8ada1e633cc0e5
2020-06-19 07:10:08 +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
TreeHugger Robot
4d7616e57a
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 am: d8a97e64b5 -s ours
...
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 00ea6cecd8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: Ibeaba2f4a62238043400321882147ecd0aa3b85c
2020-06-19 07:01:51 +00:00
TreeHugger Robot
f170953343
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 -s ours am: b207e9c9de -s ours
...
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 00ea6cecd8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: Ic7bd992bf5438db376c7bea15ff9821b7fdb5fcd
2020-06-19 07:01:40 +00:00
Lorenzo Colitti
d51b56d0b9
[automerger skipped] Memory leak due to no stop for IpNeighborMonitor. am: 93e59ee726 am: f56b2d478a -s ours
...
am skip reason: Change-Id I8f60c13706f05306e8f25a15f7861d7ecabbc10e with SHA-1 d244bd097c is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910263
Change-Id: I4f595268e288a3cb21e5e9f109319d8d0f0389de
2020-06-19 07:01:40 +00:00
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
TreeHugger Robot
d8a97e64b5
Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: Id831c7238460f31c19b647229029bc9fbf89ee5f
2020-06-19 06:51:26 +00:00
TreeHugger Robot
b207e9c9de
[automerger skipped] Merge changes I2292c1cb,I8f60c137 into rvc-dev am: aee09af636 -s ours
...
am skip reason: Change-Id I2292c1cbff06a304f70191b88d833b19af2b8b92 with SHA-1 00ea6cecd8 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11907887
Change-Id: I6cd21960502b97f81d6a8027b51ec77d6928f3a9
2020-06-19 06:51:23 +00:00
Lorenzo Colitti
f56b2d478a
Memory leak due to no stop for IpNeighborMonitor. am: 93e59ee726
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11910263
Change-Id: I22a5b3526c32c989be5c0fc644e9f177b8fe2eac
2020-06-19 06:51:19 +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
TreeHugger Robot
aee09af636
Merge changes I2292c1cb,I8f60c137 into rvc-dev
...
* changes:
Test that IpNeighborMonitor is stopped when IpServer stops.
Memory leak due to no stop for IpNeighborMonitor.
2020-06-19 06:36:50 +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
9644bc01dd
Test that IpNeighborMonitor is stopped when IpServer stops.
...
Bug: 159097215
Test: test-only change
Original-Change: https://android-review.googlesource.com/1343441
Merged-In: I2292c1cbff06a304f70191b88d833b19af2b8b92
Change-Id: I2292c1cbff06a304f70191b88d833b19af2b8b92
2020-06-19 03:06:05 +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
Lorenzo Colitti
93e59ee726
Memory leak due to no stop for IpNeighborMonitor.
...
1. When Wi-Fi enabled, ap0 interface is added and IpNeighborMonitor's
start() is invoked in IpServer's constructor.
2. There's no stop for IpNeighborMonitor when IpServer stop.
3. During overnight test for Wi-Fi, networkstack is too slow to
process request due to memory leak in IpNeighborMonitor and
binder buffer is blocked causing exception.
Solution: Invoke IpNeighborMonitor.stop() in UnavailableState.enter().
Bug: 159097215
Test: automatic, turn on and off Wi-Fi every 6 seconds overnight
Original-Change: https://android-review.googlesource.com/1343440
Merged-In: I8f60c13706f05306e8f25a15f7861d7ecabbc10e
Change-Id: I8f60c13706f05306e8f25a15f7861d7ecabbc10e
2020-06-19 02:43:57 +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