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
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
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
Mark Chien
918f37142d
[automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 788abd7c99 am: 932375528d -s ours am: df63d22cbe -s ours am: f523ae5bbd -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: I05bbffec3b2ae92a254c5f66ad90b5dd85babb5b
2020-06-20 04:58:44 +00:00
markchien
631e3434f8
[automerger skipped] Pass entitlement configuration to Settings for entitlement check am: 902043f5c3 am: f7d9dd76ab -s ours am: 1f5c10559b -s ours am: e3c5268531 -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: I7c1fdc3e1cfefd33cbbc8bc61c4b0c8ea569530e
2020-06-20 04:58:41 +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
b0ee37e42a
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 am: d8cdf78876 -s ours
...
am skip reason: Change-Id I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc with SHA-1 675697222a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11908430
Change-Id: I7f2940caf545fc5b231674f550cc7f6e9a841955
2020-06-19 08:54:07 +00:00
TreeHugger Robot
bbc97757db
[automerger skipped] Merge "Let only Ethernet manage ethernet interface up and down" into rvc-dev am: 28c2d1dcca am: ebcd7131a1 -s ours am: 693729a12c -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: Id407fcc682b6692e8a790bfbe45fb8ef968e7fbc
2020-06-19 08:53:51 +00: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
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
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
675697222a
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
Merged-In: I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc
Change-Id: I1cd40ae764bdeecbb59e3889e9399b7f4b05f9cc
2020-06-19 06:49:46 +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
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
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