TreeHugger Robot
f5e7b367d5
[automerger skipped] Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev am: 70e3f56147 -s ours am: 49d46b6c1f -s ours
...
am skip reason: Change-Id I57987233d42a0253eaee2e1ca5f28728c2354620 with SHA-1 bc4c5caa4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882397
Change-Id: I35e9898e25ff2b74c3876f0a19ce8dd6b6514011
2020-06-17 15:47:56 +00:00
TreeHugger Robot
49d46b6c1f
[automerger skipped] Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev am: 70e3f56147 -s ours
...
am skip reason: Change-Id I57987233d42a0253eaee2e1ca5f28728c2354620 with SHA-1 bc4c5caa4f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882397
Change-Id: I0b5d3d42ac9310e71262a7e8cf21af51b75837c4
2020-06-17 15:34:30 +00:00
Treehugger Robot
58897cc491
Treat RouteInfo with different interfaces as different routes
...
On Android different interfaces usually use different routing tables.
As a result, a change in interface should not be treated as route
update, but rather a remove and an add.
This change fixes a bug in VPN seamless handover where routes
failed to be updated when a new tunnel interface replaces the existing
one within the same network.
Bug: 158696878
Test: atest com.android.cts.net.HostsideVpnTests
Test: atest NetworkStackTests
Test: atest CtsNetTestCases
Test: atest FrameworksNetTests
Original-Change: https://android-review.googlesource.com/1331916
Merged-In: I57987233d42a0253eaee2e1ca5f28728c2354620
Change-Id: I57987233d42a0253eaee2e1ca5f28728c2354620
2020-06-17 13:34:11 +00:00
Treehugger Robot
0e21a83d94
Merge "Treat RouteInfo with different interfaces as different routes" am: d77e15c125 am: 157191f50f am: 7a49a3b538
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331916
Change-Id: Ia1d52507ad6d04586b9d1df3fc182982639d1218
2020-06-17 13:32:51 +00:00
Treehugger Robot
7a49a3b538
Merge "Treat RouteInfo with different interfaces as different routes" am: d77e15c125 am: 157191f50f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331916
Change-Id: I2f4d88aa74588e8ed27c5d0abcb9a6919f26f27d
2020-06-17 13:21:06 +00:00
Treehugger Robot
157191f50f
Merge "Treat RouteInfo with different interfaces as different routes" am: d77e15c125
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331916
Change-Id: Ibe919ea7c2096094fdb48fc91881d9f19678ac50
2020-06-17 13:07:42 +00:00
Treehugger Robot
d77e15c125
Merge "Treat RouteInfo with different interfaces as different routes"
2020-06-17 12:51:08 +00:00
Rubin Xu
bc4c5caa4f
Treat RouteInfo with different interfaces as different routes
...
On Android different interfaces usually use different routing tables.
As a result, a change in interface should not be treated as route
update, but rather a remove and an add.
This change fixes a bug in VPN seamless handover where routes
failed to be updated when a new tunnel interface replaces the existing
one within the same network.
Bug: 158696878
Test: atest com.android.cts.net.HostsideVpnTests
Test: atest NetworkStackTests
Test: atest CtsNetTestCases
Test: atest FrameworksNetTests
Change-Id: I57987233d42a0253eaee2e1ca5f28728c2354620
2020-06-17 12:01:41 +01:00
Aaron Huang
973cfd159a
[automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 0543f2328d am: 032d132e50 -s ours am: 43b76f917e -s ours
...
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 a8eab54eee is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1298476
Change-Id: I2058092be5426269fc93e209517a0d01c2fab1ec
2020-06-17 09:34:01 +00:00
Aaron Huang
43b76f917e
[automerger skipped] Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 0543f2328d am: 032d132e50 -s ours
...
am skip reason: Change-Id I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91 with SHA-1 a8eab54eee is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1298476
Change-Id: I11b25c0832d6959e77bbabbfce53cdedce922279
2020-06-17 09:21:52 +00:00
Aaron Huang
032d132e50
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" am: 0543f2328d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1298476
Change-Id: I1b191cd4706a7409794d382bda95ef6933b019a1
2020-06-17 09:09:13 +00:00
Aaron Huang
0543f2328d
Merge "Add unit test for NetworkStatsSubscriptionsMonitor"
2020-06-17 08:52:20 +00:00
Automerger Merge Worker
95a4790690
Merge "[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 35b7392a08 -s ours" into rvc-d1-dev-plus-aosp
2020-06-16 03:42:40 +00:00
TreeHugger Robot
fbd3829e2e
[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da am: 35b7392a08 -s ours
...
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 301bc7b40a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: I7a0a49a16ce67ddcf86ea6ad4d7ccda9f15181e9
2020-06-16 03:42:23 +00:00
TreeHugger Robot
869edf953d
[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours am: c3a780339a -s ours
...
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 301bc7b40a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: Iad71a237e3bac6340747e86a77c5569fea0bfb42
2020-06-16 03:42:22 +00:00
TreeHugger Robot
35b7392a08
Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: Ie8f59a561f7184bcfbbe38e99da78ce092475ff8
2020-06-16 03:28:44 +00:00
TreeHugger Robot
c3a780339a
[automerger skipped] Merge "Test extra info sent to NetworkMonitor" into rvc-dev am: 8202b399da -s ours
...
am skip reason: Change-Id I4f827664c528bea30cc957a0a617dd37693f4460 with SHA-1 301bc7b40a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862409
Change-Id: I63ad698bb29d3770e879f27b155a9fc656a80836
2020-06-16 03:28:39 +00:00
Chiachang Wang
1182d5a7fc
Test extra info sent to NetworkMonitor
...
Test extra info sent to NetworkMonitor correctly if network
agent is created through new NetworkAgent constructor without
legacy network info taken as parameter.
Bug: 156173829
Test: atest FrameworkNetTests
Merged-In: I4f827664c528bea30cc957a0a617dd37693f4460
Change-Id: I4f827664c528bea30cc957a0a617dd37693f4460
2020-06-16 01:57:46 +00:00
Chiachang Wang
5e26b14de2
Merge "Test extra info sent to NetworkMonitor" am: 9792742ee0 am: 26cd395a9e am: 41b5925f01
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060
Change-Id: I52edaf94601620b8b22030e586ae9de0742b3303
2020-06-16 01:16:41 +00:00
Chiachang Wang
41b5925f01
Merge "Test extra info sent to NetworkMonitor" am: 9792742ee0 am: 26cd395a9e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060
Change-Id: Ice048df853589411ee1f1c935b929994af1c525b
2020-06-16 01:02:52 +00:00
Chiachang Wang
26cd395a9e
Merge "Test extra info sent to NetworkMonitor" am: 9792742ee0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1331060
Change-Id: If48de0d3fe326d72170b13ec6a9477dfc8dc48ff
2020-06-16 00:52:01 +00:00
Chiachang Wang
9792742ee0
Merge "Test extra info sent to NetworkMonitor"
2020-06-16 00:38:58 +00:00
Benedict Wong
46ba8068c7
Merge "Set correct owner UID for VPN agentConnect()" am: 2f7bb517fd am: bab1782868 am: d01a9458ed
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493
Change-Id: Id56df437468962eea48b453c99564f68e3b38756
2020-06-15 17:38:17 +00:00
Benedict Wong
d01a9458ed
Merge "Set correct owner UID for VPN agentConnect()" am: 2f7bb517fd am: bab1782868
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493
Change-Id: I5ff673d97fe4558da77575b2cc8c43b87e3673f6
2020-06-15 17:33:33 +00:00
Benedict Wong
bab1782868
Merge "Set correct owner UID for VPN agentConnect()" am: 2f7bb517fd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1326493
Change-Id: I04609b41c9e878e1e3ca8f128d86290012d4ede7
2020-06-15 17:18:15 +00:00
Benedict Wong
2f7bb517fd
Merge "Set correct owner UID for VPN agentConnect()"
2020-06-15 17:09:46 +00:00
Aaron Huang
b0e7dca43e
Add unit test for NetworkStatsSubscriptionsMonitor
...
Bug: 154080205
Test: atest FrameworksNetTests:com.android.server.net.NetworkStatsSubscriptionsMonitorTest
(copy from ag/11788484 but getActiveAndHiddenSubscriptionIdList() since it's renamed
in internal)
Change-Id: Ia162f36efe96d90b2f6f70190d9fa855bba34484
Merged-In: I4ef3f1ab2e5ea1322133edd80db3ccd0022e9c91
2020-06-15 07:05:19 +00:00
Chiachang Wang
301bc7b40a
Test extra info sent to NetworkMonitor
...
Test extra info sent to NetworkMonitor correctly if network
agent is created through new NetworkAgent constructor without
legacy network info taken as parameter.
Bug: 156173829
Test: atest FrameworkNetTests
Change-Id: I4f827664c528bea30cc957a0a617dd37693f4460
2020-06-12 18:13:00 +08:00
Chalard Jean
a2689cb888
[automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085 am: 14280d011d -s ours
...
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 cece40543e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429
Change-Id: I7194a4a3a70f93dd510bda107f620e23fb0af19d
2020-06-12 05:12:16 +00:00
Chalard Jean
6b2aeee4eb
[automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085 -s ours am: 51732a8d91 -s ours
...
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 a5ff113bff is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429
Change-Id: I51aaef47a6e94d53a744b80fc684cd6fda6ec73c
2020-06-12 05:11:29 +00:00
Chalard Jean
51732a8d91
[automerger skipped] Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085 -s ours
...
am skip reason: Change-Id I5911d01984695550b6c9afe7a8eb535bf5e320a1 with SHA-1 a5ff113bff is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429
Change-Id: I819ea5e14c6eaf108ac7252768014aa5d33891b3
2020-06-12 04:58:29 +00:00
Chalard Jean
14280d011d
Merge "Document the limitation to a hundred callbacks." into rvc-dev am: df9ce18085
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11835429
Change-Id: Ic82a23e6f949bd2c74c3dc49da516938f0603e2e
2020-06-12 04:58:27 +00:00
Chalard Jean
df9ce18085
Merge "Document the limitation to a hundred callbacks." into rvc-dev
2020-06-12 04:54:02 +00:00
Automerger Merge Worker
88e9323c20
Merge "Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 65556318aa" into rvc-d1-dev-plus-aosp
2020-06-12 02:20:40 +00:00
Aaron Huang
8248bb9c91
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 65556318aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484
Change-Id: I0e5b064f0633474c5200ecf4620540e883af5d0b
2020-06-12 02:20:15 +00:00
Aaron Huang
4d592c0387
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769 am: 2070880fab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484
Change-Id: I7c557b81d3e5ac35b7e8559d8f5d4f5e0d29236a
2020-06-12 02:19:55 +00:00
Aaron Huang
2070880fab
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484
Change-Id: I43328c82223382978ac3475a195011547f6d0fdc
2020-06-12 02:11:58 +00:00
Aaron Huang
65556318aa
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev am: 70afc75769
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788484
Change-Id: Iac633487b359d751206e06b2352a2a9cb475811e
2020-06-12 02:11:29 +00:00
Aaron Huang
70afc75769
Merge "Add unit test for NetworkStatsSubscriptionsMonitor" into rvc-dev
2020-06-12 01:58:59 +00:00
Chalard Jean
cece40543e
Document the limitation to a hundred callbacks.
...
Some developers have been surprised by this limitation and had trouble
figuring out what the issue was. Add documentation to address this.
This also includes a drive-by removal of a duplicate check.
Bug: 149867479
Test: doc-only change
Original-Change: https://android-review.googlesource.com/1313813
Merged-In: I5911d01984695550b6c9afe7a8eb535bf5e320a1
Change-Id: I5911d01984695550b6c9afe7a8eb535bf5e320a1
2020-06-12 00:35:39 +00:00
Mark Chien
e063ebdd7f
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d am: bd60308b8f -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 f949ec251f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I9d40c0e0998d238bcde75a1417f1dbac384285d7
2020-06-11 15:45:34 +00:00
Mark Chien
0a35a27bc4
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours am: 977a7aa9db -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 e9aad6fa2b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: Ib9adc3d5bff3f75a2472ecef958a66d582fd9a97
2020-06-11 15:43:01 +00:00
Mark Chien
bd60308b8f
Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: Iece352be0190b902c4949c1feb76281653a9b59f
2020-06-11 15:42:41 +00:00
Mark Chien
977a7aa9db
[automerger skipped] Merge "Cleanup config_mobile_hotspot_provision_app usage" into rvc-dev am: ef24e2121d -s ours
...
am skip reason: Change-Id I030871c2bc46bc09c4e52970b4995f98d31bb90e with SHA-1 e9aad6fa2b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11716092
Change-Id: I03e5cf0b7950726825c781dda3b5efdc613e2dcf
2020-06-11 15:42:35 +00:00
markchien
f949ec251f
Cleanup config_mobile_hotspot_provision_app usage
...
config_mobile_hotspot_provision_app would be move out of framework and
only private for tethering only.
enforceTetherChangePermission is no longer needed because its only
caller PanService already gate by other privileged permission
(BLUETOOTH_PRIVILEGED).
Bug: 146918263
Test: m
Change-Id: I030871c2bc46bc09c4e52970b4995f98d31bb90e
Merged-In: I030871c2bc46bc09c4e52970b4995f98d31bb90e
2020-06-11 13:32:12 +00:00
Chalard Jean
ad6fb4921b
Merge "Document the limitation to a hundred callbacks." am: f60ed54d33 am: 363fb9fef9 am: 1fa0eab021
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813
Change-Id: Ie9f8c65c307cbefb6e95ec0d3099e5da875ff1c2
2020-06-11 13:16:54 +00:00
Chalard Jean
1fa0eab021
Merge "Document the limitation to a hundred callbacks." am: f60ed54d33 am: 363fb9fef9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813
Change-Id: I84b1e39503feddc914b61d4e8bd35953e92ac270
2020-06-11 13:03:37 +00:00
Chalard Jean
363fb9fef9
Merge "Document the limitation to a hundred callbacks." am: f60ed54d33
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1313813
Change-Id: Id2f70609c46ec6252b7e734c1e5838016314400f
2020-06-11 12:46:15 +00:00
Chalard Jean
f60ed54d33
Merge "Document the limitation to a hundred callbacks."
2020-06-11 12:31:09 +00:00
Chalard Jean
a5ff113bff
Document the limitation to a hundred callbacks.
...
Some developers have been surprised by this limitation and had trouble
figuring out what the issue was. Add documentation to address this.
This also includes a drive-by removal of a duplicate check.
Bug: 149867479
Test: doc-only change
Change-Id: I5911d01984695550b6c9afe7a8eb535bf5e320a1
2020-06-11 12:30:21 +00:00