Tony Mak
6dd26947ad
Merge "Get application info in the correct user id" into pi-dev
...
am: 28a696afb4
2018-03-26 17:15:29 +00:00
Tony Mak
28a696afb4
Merge "Get application info in the correct user id" into pi-dev
2018-03-26 17:04:47 +00:00
Ricky Wai
24c776f0c4
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
...
am: 2ce1e6ce2a
2018-03-26 17:01:45 +00:00
Michael West
07e389da47
Merge "add airplane mode shell commands to connectivity" into pi-dev
...
am: e0c1ee6414
2018-03-26 16:51:00 +00:00
Ricky Wai
2ce1e6ce2a
Merge "Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc" into pi-dev
2018-03-26 16:46:20 +00:00
Michael West
e0c1ee6414
Merge "add airplane mode shell commands to connectivity" into pi-dev
2018-03-26 16:38:03 +00:00
Tony Mak
2f6bcd9c06
Get application info in the correct user id
...
Fixes: 76396560
Test: Create work profile and launch hangouts in work profile.
Change-Id: Ic3727ac899153b6a96dd9b6d6921c32ba0bbd93e
2018-03-26 11:58:38 +00:00
Erik Kline
eac4afb474
[automerger skipped]Merge "Pass all relevant resolver info to netd" into pi-dev
...
am: ca697c621e -s ours
Change-Id: I5d2271059f77d290c65cd4a55d31334154e82270
2018-03-24 16:12:38 +00:00
Erik Kline
c54b9cb71a
Pass all relevant resolver info to netd
...
Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug: 34953048
Bug: 64133961
Bug: 72345192
Merged-In: I96f7747b8f0bb38d95579b688b4c2d068f1229cf
Merged-In: Ia4d896c4cc33c02f0c46d5d4c760cc33b13dff0b
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
(cherry picked from commit e5dac904d361a349f1cfc48500a678d22e3a7316)
2018-03-23 21:59:24 -07:00
mswest46
32928412a2
add airplane mode shell commands to connectivity
...
Fixes: 74410990
Test: Manually checked that commands enable/disable airplane mode.
Change-Id: I942bd4679fcd498a39b9b2cab68e8d3c00ce62d3
2018-03-24 01:53:45 +00:00
Erik Kline
905e6feea0
Merge "Pass all relevant resolver info to netd" am: ce907ddfc4
...
am: 189415933f
2018-03-24 01:16:37 +00:00
Erik Kline
189415933f
Merge "Pass all relevant resolver info to netd"
...
am: ce907ddfc4
2018-03-24 01:07:10 +00:00
Treehugger Robot
ce907ddfc4
Merge "Pass all relevant resolver info to netd"
2018-03-23 23:41:11 +00:00
Chalard Jean
52321d6b28
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
...
am: 749299b1c5
2018-03-23 09:35:34 +00:00
Chalard Jean
cc097d159f
Merge "Have the status bar listen to all macro-users VPN changes." am: 90988528c3
...
am: cdb95af156
2018-03-23 09:29:28 +00:00
TreeHugger Robot
749299b1c5
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
2018-03-23 09:26:46 +00:00
Chalard Jean
cdb95af156
Merge "Have the status bar listen to all macro-users VPN changes."
...
am: 90988528c3
2018-03-23 09:22:36 +00:00
Chalard Jean
36c387a51b
Merge "Have PermissionMonitor arbiter which app can access background networks" am: 433c0e652f
...
am: 3f05f98daa
2018-03-23 08:22:47 +00:00
Chalard Jean
3f05f98daa
Merge "Have PermissionMonitor arbiter which app can access background networks"
...
am: 433c0e652f
2018-03-23 08:12:51 +00:00
Chalard Jean
90988528c3
Merge "Have the status bar listen to all macro-users VPN changes."
2018-03-23 07:33:02 +00:00
Erik Kline
286974f384
Pass all relevant resolver info to netd
...
Test: runtest frameworks-net passes
Test: manual testing of opportunistic and strict mode works
Bug: 34953048
Bug: 64133961
Bug: 72345192
Change-Id: Ia4f1905e1fa60e7a468c2246fb809191d2ba796b
2018-03-22 23:50:13 -07:00
Chalard Jean
d7a649f8fc
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
...
am: 1f654aa247
Change-Id: I8d725b07e59654232ee41b82aac007dc6a495a01
2018-03-23 06:48:49 +00:00
Chalard Jean
433c0e652f
Merge "Have PermissionMonitor arbiter which app can access background networks"
2018-03-23 06:15:00 +00:00
Chalard Jean
38354d1f60
Have PermissionMonitor arbiter which app can access background networks
...
This will let ConnectivityService send the right callbacks to the
relevant apps.
Test: manual with apps
runtest frameworks-net
cts
new tests for this functionality
Bug: 67408339
Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
2018-03-23 13:37:56 +09:00
Remi NGUYEN VAN
7370f4270e
Merge "Add method to NetworkStatsService for UID stats." am: db89ca3c12
...
am: f61f5ff462
2018-03-23 04:01:09 +00:00
Remi NGUYEN VAN
f61f5ff462
Merge "Add method to NetworkStatsService for UID stats."
...
am: db89ca3c12
Change-Id: I2c6cba3ebbc8c23ade754cfd411ac54a561b020a
2018-03-23 03:54:13 +00:00
Ricky Wai
04baf117bf
Improve ConnectivityManager.getNetworkWatchlistConfigHash() javadoc
...
Test: NULL
Bug: 74831039
Change-Id: I227ba1377a51821204cd5830e7da6ff3a15bca02
2018-03-22 20:13:05 +00:00
Chalard Jean
e64b8d7bce
Have PermissionMonitor arbiter which app can access background networks
...
This will let ConnectivityService send the right callbacks to the
relevant apps.
Test: manual with apps
runtest frameworks-net
cts
new tests for this functionality
Bug: 67408339
Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
2018-03-22 19:03:59 +09:00
Remi NGUYEN VAN
1cb92c713f
Add method to NetworkStatsService for UID stats.
...
Useful for clients such as BatteryStats which currently rely
on NetworkStatsFactory. Data at that stage is incomplete as
it does not account for tethering, VT data and corresponding
464xlat corrections.
Test: runtest frameworks-net, CTS tests pass.
Change-Id: I763b77f601c827fd2963204694fb5b45425cc791
2018-03-22 15:31:28 +09:00
Chalard Jean
7c74b9f311
Have the status bar listen to all macro-users VPN changes.
...
Bug: 73217368
Test: manual
Using Datally on work profile. Before this, enabling the VPN
does not show the key icon. After this it does.
Change-Id: I454eb8f3881a48af1b0187c2b14a2a399d3c2445
2018-03-22 13:25:52 +09:00
Chalard Jean
088588d3fb
Have the status bar listen to all macro-users VPN changes.
...
Bug: 73217368
Test: manual
Using Datally on work profile. Before this, enabling the VPN
does not show the key icon. After this it does.
Change-Id: I454eb8f3881a48af1b0187c2b14a2a399d3c2445
2018-03-22 13:25:09 +09:00
Nathan Harold
2b491fba1d
Merge changes I4c26aea7,I79911434 into pi-dev
...
am: 095b9e8e1c -s ours
Change-Id: I19626bf87d31c759939c6aafc42ae679f6cb18e4
2018-03-21 21:35:13 +00:00
Benedict Wong
ce6e8b6e60
Merge "Added implementation for VTI add/remove address" into pi-dev
...
am: f801b8ae69 -s ours
Change-Id: I1f77872860e705606ba9f0c7f95200ee5bdbe499
2018-03-21 17:39:56 +00:00
nharold
d863c59e17
Merge "Check mOwnedByTransform to avoid DELSA on SPI" am: 94d8fa0da6
...
am: af4c28192c
2018-03-21 05:01:47 +00:00
nharold
af4c28192c
Merge "Check mOwnedByTransform to avoid DELSA on SPI"
...
am: 94d8fa0da6
Change-Id: Id194eb67947e9dae369b2a2d30b55e7e1cf2d7c8
2018-03-21 03:36:44 +00:00
Nathan Harold
bfcc17cc20
Check mOwnedByTransform to avoid DELSA on SPI
...
The owned by transform flag prevents the removal
of an SPI from accidentally deleting an associated
SA in the kernel. That flag wasn't actually being
checked, so deleting an SPI would result in the
transform being removed.
The existing code already guarantees that the SA is
deleted when the transform is deleted
Bug: 73258845
Test: runtest frameworks-net
Merged-In: I4c26aea7af817a5d9e54da5db1cdf4f943bcae06
Change-Id: I4c26aea7af817a5d9e54da5db1cdf4f943bcae06
(cherry picked from commit 22795302be4ec35449908cf566aa7c16945df836)
2018-03-20 18:29:02 -07:00
Benedict Wong
76df78ffbf
Added implementation for VTI add/remove address
...
This change adds implementation details for add/remove addresses onto a
VTI.
Bug: 73675031
Test: New tests added, passing on Walleye
Merged-In: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
Change-Id: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
(cherry picked from commit ecc9f7cc08804e3fa15fea04ae94ea1bc74edbfe)
2018-03-20 16:01:27 -07:00
Nathan Harold
bd12ffffc0
Check mOwnedByTransform to avoid DELSA on SPI
...
The owned by transform flag prevents the removal
of an SPI from accidentally deleting an associated
SA in the kernel. That flag wasn't actually being
checked, so deleting an SPI would result in the
transform being removed.
The existing code already guarantees that the SA is
deleted when the transform is deleted
Bug: 73258845
Test: runtest frameworks-net
Change-Id: I4c26aea7af817a5d9e54da5db1cdf4f943bcae06
2018-03-20 11:26:29 -07:00
Benedict Wong
696b853a11
Merge "Added implementation for VTI add/remove address" am: 3f3410ae6b
...
am: c9b0114429
2018-03-20 00:09:15 +00:00
Benedict Wong
c9b0114429
Merge "Added implementation for VTI add/remove address"
...
am: 3f3410ae6b
2018-03-19 23:45:10 +00:00
Benedict Wong
3f3410ae6b
Merge "Added implementation for VTI add/remove address"
2018-03-19 22:05:09 +00:00
Benedict Wong
0da1f39e22
Added implementation for VTI add/remove address
...
This change adds implementation details for add/remove addresses onto a
VTI.
Bug: 73675031
Test: New tests added, passing on Walleye
Change-Id: Idde9d943a5285d2c13c5c6b0f7b8a9faf718e6a5
2018-03-16 10:25:43 -07:00
Pavel Maltsev
3152f214df
Merge "Fixing comments in Network Capabilities" am: b6477d22ca
...
am: 2c36870f3d
2018-03-12 08:08:31 +00:00
Pavel Maltsev
2c36870f3d
Merge "Fixing comments in Network Capabilities"
...
am: b6477d22ca
2018-03-12 07:57:07 +00:00
Treehugger Robot
b6477d22ca
Merge "Fixing comments in Network Capabilities"
2018-03-12 07:42:58 +00:00
Chalard Jean
69dcff707c
Merge "Deprecate most of NetworkInfo." into pi-dev
...
am: bf7610aa8a
2018-03-10 08:08:09 +00:00
Chalard Jean
bf7610aa8a
Merge "Deprecate most of NetworkInfo." into pi-dev
2018-03-10 07:51:11 +00:00
Chad Brubaker
e5430e041f
Merge "Expose CONNECTIVITY_ACTION to Instant Apps" into pi-dev
...
am: aa72b2036a
Change-Id: I0434f8c7292a85e25df3da2858e4d89cf55fab3d
2018-03-10 06:20:56 +00:00
Pavel Maltsev
1f9f48e1c4
Fixing comments in Network Capabilities
...
Clean up after aosp/606338
Test: m -j (only comments has been changed)
Change-Id: I2627654450244024c2be92f9067534dfc2a80891
2018-03-09 10:42:32 -08:00
Chalard Jean
17a24cb956
Merge "Deprecate most of NetworkInfo." am: 58ae164c97
...
am: 97aaa25bf0
2018-03-09 13:12:08 +00:00
