Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe am: 48af15ae8b
...
am: db8b553287
Change-Id: Ib755bbfc5bb6bff4ada3995b70dfe8fc2d40b4f9
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-29 03:39:27 -08:00
5dc4775510
Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe
...
am: 48af15ae8b
Change-Id: I978bdb626c1f4c8bbe736c8bad1c74fb6a67b4b5
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-29 03:29:01 -08:00
db8b553287
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
Remi NGUYEN VAN
commited 2019-01-29 17:30:26 +09:00
a5225eaf51
Merge "Add SocketUtils for NetworkStack" am: 75546d4e9d am: 68a0c1de33
...
am: dae2e37ce0
Change-Id: I6d059f9cd1a694659bfd7ac09a32022d29c03f85
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-28 23:47:36 -08:00
287ce3d267
Merge "Add SocketUtils for NetworkStack" am: 75546d4e9d
...
am: 68a0c1de33
Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-28 22:57:39 -08:00
dae2e37ce0
Merge "Whitelist packages from VPN lockdown." am: 2c13733fac am: 4513467368
...
am: a9c8b8a489
Change-Id: Ice1f8f27da3d0092af58c8e93969575ba9f8f925
Pavel Grafov
authored and
android-build-merger
commited 2019-01-28 22:13:24 -08:00
45e14f9576
Merge "Whitelist packages from VPN lockdown." am: 2c13733fac
...
am: 4513467368
Change-Id: I10094606f74e6cdc5f4b0b6591cf776fd895b1d3
Pavel Grafov
authored and
android-build-merger
commited 2019-01-28 21:34:03 -08:00
a9c8b8a489
Merge "Add SocketUtils for NetworkStack"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2019-01-28 23:14:08 +00:00
75546d4e9d
Merge "Whitelist packages from VPN lockdown."
Pavel Grafov
authored and
Gerrit Code Review
commited 2019-01-28 20:15:49 +00:00
2c13733fac
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
Remi NGUYEN VAN
commited 2019-01-28 20:11:27 +09:00
6f08bb23a1
Merge "Move NetworkUtils used by NetworkStack" am: 1ee45c9bfb
...
am: 1e69c8baca
Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-28 01:30:17 -08:00
93bbacda97
Merge "Move NetworkUtils used by NetworkStack"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2019-01-28 09:06:20 +00:00
1ee45c9bfb
Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259
...
am: 05ec4875a0
Change-Id: I843cb189750666a2cb70b1960d49dfe797f3cf36
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-28 00:35:46 -08:00
f554e1392c
Merge "Move NetworkUtils used by NetworkStack"
Remi NGUYEN VAN
authored and
Android (Google) Code Review
commited 2019-01-28 06:57:25 +00:00
fd36bc7e74
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
Remi NGUYEN VAN
commited 2019-01-28 13:45:46 +09:00
4427014710
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
Remi NGUYEN VAN
commited 2019-01-28 13:45:17 +09:00
926e230392
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
Remi NGUYEN VAN
commited 2019-01-28 13:28:35 +09:00
d57b49cb4b
Merge "Add NetworkStack networking deps to SystemApi"
Lorenzo Colitti
authored and
Android (Google) Code Review
commited 2019-01-28 02:58:01 +00:00
29d41a316d
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Change-Id: I9119c139ab07a761ce5dfd1365b70eb905fd32dc
Pavel Grafov
commited 2019-01-25 19:59:03 +00:00
4753f40339
Add NetworkStack networking deps to SystemApi
...
Test: atest FrameworksNetTests
Bug: 112869080
Change-Id: Id59dc06fb85e4ac88098f56b621ec880610759ce
Remi NGUYEN VAN
commited 2019-01-25 09:05:58 +09:00
ae98229898
resolve merge conflicts of d7f2320945 to master
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7256999a13b713607cfb4c844bf1bc7b37b827a7
Dan Albert
commited 2019-01-24 14:46:02 -08:00
61bb568007
Merge "Revert "Whitelist packages from VPN lockdown."" am: 0246fc7f38
...
am: 3ffcc2d808
Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8
Dan Albert
authored and
android-build-merger
commited 2019-01-24 13:58:15 -08:00
d7f2320945
Merge "Revert "Whitelist packages from VPN lockdown.""
Dan Albert
authored and
Gerrit Code Review
commited 2019-01-24 21:08:46 +00:00
0246fc7f38
Revert "Whitelist packages from VPN lockdown."
...
This reverts commit b66ec9bbf7 .
Reason for revert: broke pi-dev-plus-aosp
Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68
Dan Albert
commited 2019-01-24 21:05:39 +00:00
bc9dd2b1aa
Merge "Add API for proxy configuration over VPN." am: a72ef3ff55
...
am: 6ff618c944
Change-Id: I51930e4ed99cc3df10db2c8bbef27989f0a06a46
Irina Dumitrescu
authored and
android-build-merger
commited 2019-01-24 10:20:32 -08:00
6cbfaa5bb4
Merge "Whitelist packages from VPN lockdown." am: 5bc0c4f1ca
...
am: abc3e7bd1f
Change-Id: I643fc2603f7cd2b928fe517eb473048004273835
Pavel Grafov
authored and
android-build-merger
commited 2019-01-24 10:06:37 -08:00
cd5753de76
Merge "Add API for proxy configuration over VPN."
Treehugger Robot
authored and
Gerrit Code Review
commited 2019-01-24 17:52:22 +00:00
a72ef3ff55
Merge "Whitelist packages from VPN lockdown."
Pavel Grafov
authored and
Gerrit Code Review
commited 2019-01-24 17:34:55 +00:00
5bc0c4f1ca
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
Pavel Grafov
commited 2019-01-24 16:17:11 +00:00
b66ec9bbf7
Merge "Whitelist packages from VPN lockdown."
Pavel Grafov
authored and
Android (Google) Code Review
commited 2019-01-24 16:15:08 +00:00
a7789bb2f0
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
Irina Dumitrescu
commited 2019-01-24 16:07:20 +00:00
0eafa0b5c8
Merge "Add API for proxy configuration over VPN."
TreeHugger Robot
authored and
Android (Google) Code Review
commited 2019-01-24 15:09:18 +00:00
4601fb3171
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
Irina Dumitrescu
commited 2019-01-24 12:54:19 +00:00
3a83884883
Whitelist packages from VPN lockdown.
...
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn
Test: MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot
Change-Id: I7f6c5b9172063b588feacd6b9930a6cb88f764ab
Pavel Grafov
commited 2019-01-24 11:34:17 +00:00
a2f5288aed
Merge "Add additional SystemApi for NetworkStack" am: 962a145379
...
am: a60b0e6188
Change-Id: I5bdc50e7886731f61222bd1edd33765941118175
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-24 02:17:38 -08:00
371d617c4b
Merge "Add additional SystemApi for NetworkStack"
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2019-01-24 09:55:01 +00:00
962a145379
Merge "Add additional SystemApi for NetworkStack"
Remi NGUYEN VAN
authored and
Android (Google) Code Review
commited 2019-01-24 07:37:52 +00:00
0d7fd388a6
Merge changes from topic "ka05" am: 908eb08326 am: 9a4614f4b0
...
am: ee5162e5b5
Change-Id: Ie56c431a6d934c752d1de30fc4bf98a7e557e5b2
Junyu Lai
authored and
android-build-merger
commited 2019-01-23 22:24:41 -08:00
56277ab83f
Merge changes from topic "ka05" am: 908eb08326
...
am: 9a4614f4b0
Change-Id: I08979872a03c52e933daa39730fd71e998272613
Junyu Lai
authored and
android-build-merger
commited 2019-01-23 21:44:11 -08:00
ee5162e5b5
Merge changes from topic "ka05"
...
* changes:
[KA05] Export keepalive offload api for IpSec Nat-T file descriptor
[KA01] export SocketKeepalive API for NAT-T keepalive
Junyu Lai
authored and
Gerrit Code Review
commited 2019-01-24 05:06:39 +00:00
908eb08326
Merge changes I1250730c,I7d00848c am: c391533617 am: 0e12b04421
...
am: 1cb4137701
Change-Id: Icc938491a9c4474cc27a4376ef03c954aac461b3
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-23 09:01:09 -08:00
80d745af3a
Merge changes I1250730c,I7d00848c am: c391533617
...
am: 0e12b04421
Change-Id: I31c9f6c11d0f52a34f68151fc2baca1921dcadad
Remi NGUYEN VAN
authored and
android-build-merger
commited 2019-01-23 08:40:50 -08:00
1cb4137701
[KA05] Export keepalive offload api for IpSec Nat-T file descriptor
...
Adds system api of createSocketKeepalive to take file descriptor,
so privileged apps could use it without the need of IpSecService.
Bug: 114151147
Test: atest FrameworksNetTests
Change-Id: If926c21704b6ed73a0adfcadad732b97b42bacae
junyulai
commited 2019-01-24 00:40:25 +08:00
48a5938ee8
Add additional SystemApi for NetworkStack
...
Members in this CL were missed in earlier changes.
Test: m
Bug: 112869080
Merged-In: I8b5b80ea7b267357eb0387d504a2f78358d6d502
Change-Id: I8b9b15f8b91962f3ef554fd222a825e471806c9e
Remi NGUYEN VAN
commited 2019-01-24 01:01:13 +09:00
155b7b7342
Add additional SystemApi for NetworkStack
...
Members in this CL were missed in earlier changes.
Test: m
Bug: 112869080
Change-Id: I8b5b80ea7b267357eb0387d504a2f78358d6d502
Remi NGUYEN VAN
commited 2019-01-24 00:55:43 +09:00
76be7232a7
[KA01] export SocketKeepalive API for NAT-T keepalive
...
The new set of API replace the PacketKeepalive system API
which is only specific for IPsec NAT-T keepalive packet. Allows
applications to request different types of keepalives through
the same set of API.
By using keepalives, applications could request system to
periodically send specific packets on their behalf, using
hardware offload to save battery power.
This change would only address interface change and test part of
original functionality. After all reference of PacketKeepalive
are removed, another change would be submitted to remove old
API.
Bug: 114151147
Test: atest FrameworksNetTests
Change-Id: I3367666810acc44d5ad20e19acd4bf936e8b5d9c
junyulai
commited 2019-01-23 23:17:17 +08:00
a86defca11
Merge changes I1250730c,I7d00848c
...
* changes:
Create a wrapper for IpClient
Move IpClient to NetworkStack
Remi NGUYEN VAN
authored and
Gerrit Code Review
commited 2019-01-23 15:05:00 +00:00
c391533617
Merge changes from topic "Java async dns" am: 8c684211f0 am: 10fb7d86f8
...
am: 4757e61c18
Change-Id: I12f50513eee1c1cf3c908036fe80d3a3d8c373d0
Luke Huang
authored and
android-build-merger
commited 2019-01-23 01:24:21 -08:00
143fdd80bb
Merge changes from topic "Java async dns" am: 8c684211f0
...
am: 10fb7d86f8
Change-Id: I305cf0ae791f9503519884bdf382863002357ac7
Luke Huang
authored and
android-build-merger
commited 2019-01-23 01:14:34 -08:00
4757e61c18
Merge changes from topic "Java async dns"
...
* changes:
Add asynchronous DNS query API in Java
Add jni method for DnsResolver
Luke Huang
authored and
Gerrit Code Review
commited 2019-01-23 08:48:23 +00:00
8c684211f0