Remi NGUYEN VAN
5896eb1b1a
Merge "Add NetworkUtils utilities to SystemApi"
...
am: 9cc31061fe
Change-Id: I82f20718d86b08cd0916ee33300ca0ee734305a6
2019-01-29 03:17:41 -08:00
Remi NGUYEN VAN
c7fe99fdbe
Add NetworkUtils utilities to SystemApi
...
attach*Filter and addArpEntry are necessary for the NetworkStack but are
only usable for apps that have system permissions.
Also includes system API for IpPrefix, LinkAddress, LinkProperties,
Network, and static modifier in ApfCapabilities that were missed in
previous CLs.
Test: Builds, flashed, WiFi works
Bug: 112869080
Change-Id: If141ae6a2f9145f5af64ba002ca44938f39b90a9
2019-01-29 17:30:26 +09:00
Remi NGUYEN VAN
bb818c790f
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e am: e90dc24b2c
...
am: d3e5405831
Change-Id: I6d059f9cd1a694659bfd7ac09a32022d29c03f85
2019-01-28 23:47:36 -08:00
Remi NGUYEN VAN
d3e5405831
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e
...
am: e90dc24b2c
Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9
2019-01-28 22:57:39 -08:00
Pavel Grafov
0d31afb2a0
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c am: f6c5ef95d1
...
am: e4dab6797f
Change-Id: Ice1f8f27da3d0092af58c8e93969575ba9f8f925
2019-01-28 22:13:24 -08:00
Pavel Grafov
e4dab6797f
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c
...
am: f6c5ef95d1
Change-Id: I10094606f74e6cdc5f4b0b6591cf776fd895b1d3
2019-01-28 21:34:03 -08:00
Remi NGUYEN VAN
e90dc24b2c
Merge "Add SocketUtils for NetworkStack"
...
am: 37053eb78e
Change-Id: I0db40afbf2de55d77d9d5493e556f499d2383f59
2019-01-28 21:19:36 -08:00
Pavel Grafov
f6c5ef95d1
Merge "Whitelist packages from VPN lockdown."
...
am: 76e3e0052c
Change-Id: I3332e495ba0c903dff3dbb9c53c5c4784ea519f4
2019-01-28 20:18:23 -08:00
Remi NGUYEN VAN
37053eb78e
Merge "Add SocketUtils for NetworkStack"
2019-01-28 23:14:08 +00:00
Pavel Grafov
76e3e0052c
Merge "Whitelist packages from VPN lockdown."
2019-01-28 20:15:49 +00:00
Remi NGUYEN VAN
a628730d0a
Add SocketUtils for NetworkStack
...
These utilities can only be used for privileged apps. The underlying
implementation cannot be @SystemApi.
Test: m
Bug: 112869080
Change-Id: Idfa90561102e5b03ab2b79486d3ad46457128bf8
2019-01-28 20:11:27 +09:00
Remi NGUYEN VAN
e524010c7b
[automerger skipped] Merge "Move NetworkUtils used by NetworkStack" am: 8f8deae60f am: 249646cc60
...
am: 8d31333b7d -s ours
am skip reason: change_id Ie20dcee375b377236004a7689890729493aca857 with SHA1 98d9df7a9b is in history
Change-Id: I5ea53ddf91c48d0700fe37318647b1e1fa26de23
2019-01-28 01:47:49 -08:00
Remi NGUYEN VAN
8d31333b7d
Merge "Move NetworkUtils used by NetworkStack" am: 8f8deae60f
...
am: 249646cc60
Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc
2019-01-28 01:30:17 -08:00
Remi NGUYEN VAN
249646cc60
Merge "Move NetworkUtils used by NetworkStack"
...
am: 8f8deae60f
Change-Id: Ib83c3cb8ced0d226bd57375cd4600665d72fd962
2019-01-28 01:21:01 -08:00
Remi NGUYEN VAN
8f8deae60f
Merge "Move NetworkUtils used by NetworkStack"
2019-01-28 09:06:20 +00:00
Remi NGUYEN VAN
6f11038314
[automerger skipped] Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259 am: 5fb799d7ee
...
am: d08b6d2105 -s ours
am skip reason: change_id Id59dc06fb85e4ac88098f56b621ec880610759ce with SHA1 b432c2c45c is in history
Change-Id: I8e2ed91ef75e3a2f855b2b3549c0db5e1511ca5e
2019-01-28 00:44:06 -08:00
Remi NGUYEN VAN
d08b6d2105
Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259
...
am: 5fb799d7ee
Change-Id: I843cb189750666a2cb70b1960d49dfe797f3cf36
2019-01-28 00:35:46 -08:00
Remi NGUYEN VAN
5fb799d7ee
Merge "Add NetworkStack networking deps to SystemApi"
...
am: 9188b49259
Change-Id: Id8b31f100ab07ca9a38f4cff26c719dd9d74bc54
2019-01-28 00:26:39 -08:00
Remi NGUYEN VAN
b19997dbe9
Merge "Move NetworkUtils used by NetworkStack"
2019-01-28 06:57:25 +00:00
Remi NGUYEN VAN
98d9df7a9b
Move NetworkUtils used by NetworkStack
...
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
(Cherry-pick of aosp/881952)
Change-Id: Ie20dcee375b377236004a7689890729493aca857
2019-01-28 13:45:46 +09:00
Remi NGUYEN VAN
e167e117c1
Move NetworkUtils used by NetworkStack
...
Depending on usage move into NetworkStackUtils or shared
Inet4AddressUtils.
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Merged-In: Ie20dcee375b377236004a7689890729493aca857
Change-Id: Ib8d000529872796022706a35050fdc2c7141f2ab
2019-01-28 13:45:17 +09:00
Remi NGUYEN VAN
8bd18cff9a
Add NetworkStack networking deps to SystemApi
...
Cherry-pick with conflicts fixed in CaptivePortalLoginActivity imports.
Test: atest FrameworksNetTests
Bug: 112869080
Merged-In: Id59dc06fb85e4ac88098f56b621ec880610759ce
Change-Id: I3c05e8fdd70497426d4fa433295c4fbdad07d9c9
2019-01-28 13:28:35 +09:00
Lorenzo Colitti
1e67080e20
Merge "Add NetworkStack networking deps to SystemApi"
2019-01-28 02:58:01 +00:00
Pavel Grafov
3aeb3f3455
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Change-Id: I9119c139ab07a761ce5dfd1365b70eb905fd32dc
2019-01-25 19:59:03 +00:00
Remi NGUYEN VAN
b432c2c45c
Add NetworkStack networking deps to SystemApi
...
Test: atest FrameworksNetTests
Bug: 112869080
Change-Id: Id59dc06fb85e4ac88098f56b621ec880610759ce
2019-01-25 09:05:58 +09:00
Dan Albert
dfaba10dba
resolve merge conflicts of 511c26364f to master
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7256999a13b713607cfb4c844bf1bc7b37b827a7
2019-01-24 14:46:02 -08:00
Dan Albert
511c26364f
Merge "Revert "Whitelist packages from VPN lockdown."" am: 7e81ae73b4
...
am: 8840cbd3fa
Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8
2019-01-24 13:58:15 -08:00
Dan Albert
8840cbd3fa
Merge "Revert "Whitelist packages from VPN lockdown.""
...
am: 7e81ae73b4
Change-Id: Ibaf799dc2664a6b3b743030da956679a3414ad9d
2019-01-24 13:45:19 -08:00
Dan Albert
7e81ae73b4
Merge "Revert "Whitelist packages from VPN lockdown.""
2019-01-24 21:08:46 +00:00
Dan Albert
45f1a24661
Revert "Whitelist packages from VPN lockdown."
...
This reverts commit f1a610a1c2 .
Reason for revert: broke pi-dev-plus-aosp
Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68
2019-01-24 21:05:39 +00:00
Irina Dumitrescu
0c79de0bd6
[automerger skipped] Merge "Add API for proxy configuration over VPN." am: b11e29d4b3 am: 83662532c8
...
am: d44785fc13 -s ours
am skip reason: change_id Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a with SHA1 8767f41688 is in history
Change-Id: I1b5f49892d2ff473b5fe7d3d1e71e3cd3ffaca26
2019-01-24 11:14:25 -08:00
Pavel Grafov
2a95537379
[automerger skipped] Merge "Whitelist packages from VPN lockdown." am: bec7854508 am: 4934a54f2e
...
am: bb4dff941d -s ours
am skip reason: change_id I7f6c5b9172063b588feacd6b9930a6cb88f764ab with SHA1 58e8be00ee is in history
Change-Id: I56f2eadd2e95a74897d7e17cb21d672e747b8261
2019-01-24 11:00:58 -08:00
Irina Dumitrescu
d44785fc13
Merge "Add API for proxy configuration over VPN." am: b11e29d4b3
...
am: 83662532c8
Change-Id: I51930e4ed99cc3df10db2c8bbef27989f0a06a46
2019-01-24 10:20:32 -08:00
Irina Dumitrescu
83662532c8
Merge "Add API for proxy configuration over VPN."
...
am: b11e29d4b3
Change-Id: I647aec5f7678668b8ef7d616150adac1086dbbdd
2019-01-24 10:08:07 -08:00
Pavel Grafov
bb4dff941d
Merge "Whitelist packages from VPN lockdown." am: bec7854508
...
am: 4934a54f2e
Change-Id: I643fc2603f7cd2b928fe517eb473048004273835
2019-01-24 10:06:37 -08:00
Treehugger Robot
b11e29d4b3
Merge "Add API for proxy configuration over VPN."
2019-01-24 17:52:22 +00:00
Pavel Grafov
4934a54f2e
Merge "Whitelist packages from VPN lockdown."
...
am: bec7854508
Change-Id: I329e24f1359a11a72ae9d0a23d2dc5b5de5aa8a7
2019-01-24 09:49:42 -08:00
Pavel Grafov
bec7854508
Merge "Whitelist packages from VPN lockdown."
2019-01-24 17:34:55 +00:00
Pavel Grafov
f1a610a1c2
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Merged-In: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
2019-01-24 16:17:11 +00:00
Pavel Grafov
affdbb9b26
Merge "Whitelist packages from VPN lockdown."
2019-01-24 16:15:08 +00:00
Irina Dumitrescu
de132bb6d6
Add API for proxy configuration over VPN.
...
Test: runtest -x
frameworks/base/tests/net/java/com/android/server/ConnectivityServiceTest.java
&& atest HostsideVpnTests
Bug: 76001058
Change-Id: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
Merged-In: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
2019-01-24 16:07:20 +00:00
TreeHugger Robot
f2cef662ec
Merge "Add API for proxy configuration over VPN."
2019-01-24 15:09:18 +00:00
Irina Dumitrescu
8767f41688
Add API for proxy configuration over VPN.
...
Test: runtest -x
frameworks/base/tests/net/java/com/android/server/ConnectivityServiceTest.java
&& atest HostsideVpnTests
Bug: 76001058
Change-Id: Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a
2019-01-24 12:54:19 +00:00
Lucas Lin
b723dfe0de
Merge "Popup a notification after logging in the captive portal network" am: 01eeab4954 am: 37f5d453ee
...
am: 3037c709a7
Change-Id: I62b9ef24f3a7f9fe75450a05d19dffda3b84d4b5
2019-01-24 03:56:21 -08:00
Lucas Lin
3037c709a7
Merge "Popup a notification after logging in the captive portal network" am: 01eeab4954
...
am: 37f5d453ee
Change-Id: I46598799c8a21d986d1790afc5c4b01726081e97
2019-01-24 03:41:40 -08:00
Pavel Grafov
58e8be00ee
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
2019-01-24 11:34:17 +00:00
Lucas Lin
37f5d453ee
Merge "Popup a notification after logging in the captive portal network"
...
am: 01eeab4954
Change-Id: I78321e10014525dfb02da29ee2f3cd4487bf30db
2019-01-24 03:27:36 -08:00
Lucas Lin
01eeab4954
Merge "Popup a notification after logging in the captive portal network"
2019-01-24 11:06:12 +00:00
Remi NGUYEN VAN
784255d6cd
[automerger skipped] Merge "Add additional SystemApi for NetworkStack" am: 24f1f0be3c am: 61c2962d74
...
am: a0beaeb29a -s ours
am skip reason: change_id I8b5b80ea7b267357eb0387d504a2f78358d6d502 with SHA1 daace816db is in history
Change-Id: I023f2b404c2444289ddb016a88b731e6813b7edb
2019-01-24 02:31:56 -08:00
Remi NGUYEN VAN
a0beaeb29a
Merge "Add additional SystemApi for NetworkStack" am: 24f1f0be3c
...
am: 61c2962d74
Change-Id: I5bdc50e7886731f61222bd1edd33765941118175
2019-01-24 02:17:38 -08:00