Message	SHA1
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e am: e90dc24b2c ... am: d3e5405831 Change-Id: I6d059f9cd1a694659bfd7ac09a32022d29c03f85 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-28 23:47:36 -08:00	bb818c790f
Merge "Add SocketUtils for NetworkStack" am: 37053eb78e ... am: e90dc24b2c Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-28 22:57:39 -08:00	d3e5405831
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c am: f6c5ef95d1 ... am: e4dab6797f Change-Id: Ice1f8f27da3d0092af58c8e93969575ba9f8f925 Pavel Grafov   authored and   android-build-merger   commited 2019-01-28 22:13:24 -08:00	0d31afb2a0
Merge "Whitelist packages from VPN lockdown." am: 76e3e0052c ... am: f6c5ef95d1 Change-Id: I10094606f74e6cdc5f4b0b6591cf776fd895b1d3 Pavel Grafov   authored and   android-build-merger   commited 2019-01-28 21:34:03 -08:00	e4dab6797f
Merge "Add SocketUtils for NetworkStack" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-28 23:14:08 +00:00	37053eb78e
Merge "Whitelist packages from VPN lockdown." Pavel Grafov   authored and   Gerrit Code Review   commited 2019-01-28 20:15:49 +00:00	76e3e0052c
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	a628730d0a
Merge "Move NetworkUtils used by NetworkStack" am: 8f8deae60f ... am: 249646cc60 Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-28 01:30:17 -08:00	8d31333b7d
Merge "Move NetworkUtils used by NetworkStack" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-28 09:06:20 +00:00	8f8deae60f
Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259 ... am: 5fb799d7ee Change-Id: I843cb189750666a2cb70b1960d49dfe797f3cf36 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-28 00:35:46 -08:00	d08b6d2105
Merge "Move NetworkUtils used by NetworkStack" Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2019-01-28 06:57:25 +00:00	b19997dbe9
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	98d9df7a9b
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	e167e117c1
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	8bd18cff9a
Merge "Add NetworkStack networking deps to SystemApi" Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2019-01-28 02:58:01 +00:00	1e67080e20
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	3aeb3f3455
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	b432c2c45c
resolve merge conflicts of 511c26364f 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	dfaba10dba
Merge "Revert "Whitelist packages from VPN lockdown."" am: 7e81ae73b4 ... am: 8840cbd3fa Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8 Dan Albert   authored and   android-build-merger   commited 2019-01-24 13:58:15 -08:00	511c26364f
Merge "Revert "Whitelist packages from VPN lockdown."" Dan Albert   authored and   Gerrit Code Review   commited 2019-01-24 21:08:46 +00:00	7e81ae73b4
Revert "Whitelist packages from VPN lockdown." ... This reverts commit f1a610a1c2. Reason for revert: broke pi-dev-plus-aosp Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68 Dan Albert   commited 2019-01-24 21:05:39 +00:00	45f1a24661
Merge "Add API for proxy configuration over VPN." am: b11e29d4b3 ... am: 83662532c8 Change-Id: I51930e4ed99cc3df10db2c8bbef27989f0a06a46 Irina Dumitrescu   authored and   android-build-merger   commited 2019-01-24 10:20:32 -08:00	d44785fc13
Merge "Whitelist packages from VPN lockdown." am: bec7854508 ... am: 4934a54f2e Change-Id: I643fc2603f7cd2b928fe517eb473048004273835 Pavel Grafov   authored and   android-build-merger   commited 2019-01-24 10:06:37 -08:00	bb4dff941d
Merge "Add API for proxy configuration over VPN." Treehugger Robot   authored and   Gerrit Code Review   commited 2019-01-24 17:52:22 +00:00	b11e29d4b3
Merge "Whitelist packages from VPN lockdown." Pavel Grafov   authored and   Gerrit Code Review   commited 2019-01-24 17:34:55 +00:00	bec7854508
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	f1a610a1c2
Merge "Whitelist packages from VPN lockdown." Pavel Grafov   authored and   Android (Google) Code Review   commited 2019-01-24 16:15:08 +00:00	affdbb9b26
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	de132bb6d6
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	f2cef662ec
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	8767f41688
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	58e8be00ee
Merge "Add additional SystemApi for NetworkStack" am: 24f1f0be3c ... am: 61c2962d74 Change-Id: I5bdc50e7886731f61222bd1edd33765941118175 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-24 02:17:38 -08:00	a0beaeb29a
Merge "Add additional SystemApi for NetworkStack" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-24 09:55:01 +00:00	24f1f0be3c
Merge "Add additional SystemApi for NetworkStack" Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2019-01-24 07:37:52 +00:00	3d05670a44
Merge changes from topic "ka05" am: 455df13823 am: 81a501ea8d ... am: 3f899a7fdb Change-Id: Ie56c431a6d934c752d1de30fc4bf98a7e557e5b2 Junyu Lai   authored and   android-build-merger   commited 2019-01-23 22:24:41 -08:00	d412f97c5d
Merge changes from topic "ka05" am: 455df13823 ... am: 81a501ea8d Change-Id: I08979872a03c52e933daa39730fd71e998272613 Junyu Lai   authored and   android-build-merger   commited 2019-01-23 21:44:11 -08:00	3f899a7fdb
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	455df13823
Merge changes I1250730c,I7d00848c am: 4bcdcfebd4 am: 3bf01b0fbe ... am: 2a929123b3 Change-Id: Icc938491a9c4474cc27a4376ef03c954aac461b3 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-23 09:01:09 -08:00	db42444fc0
Merge changes I1250730c,I7d00848c am: 4bcdcfebd4 ... am: 3bf01b0fbe Change-Id: I31c9f6c11d0f52a34f68151fc2baca1921dcadad Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-23 08:40:50 -08:00	2a929123b3
[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	d05a192fbe
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	d9f75865cf
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	daace816db
[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	4c95b08a23
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	4bcdcfebd4
Merge changes from topic "Java async dns" am: 6fd9d58242 am: ee35d6a4f2 ... am: 743161b3e4 Change-Id: I12f50513eee1c1cf3c908036fe80d3a3d8c373d0 Luke Huang   authored and   android-build-merger   commited 2019-01-23 01:24:21 -08:00	45c9f33845
Merge changes from topic "Java async dns" am: 6fd9d58242 ... am: ee35d6a4f2 Change-Id: I305cf0ae791f9503519884bdf382863002357ac7 Luke Huang   authored and   android-build-merger   commited 2019-01-23 01:14:34 -08:00	743161b3e4
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	6fd9d58242
Move IpClient to NetworkStack ... Test: atest FrameworksNetTests NetworkStackTests Bug: b/112869080 Change-Id: I7d00848c052382cd1b6ce458868bed6a1e9e8ec5 Remi NGUYEN VAN   commited 2019-01-23 16:44:21 +09:00	290455ec58
Merge "Add getAvoidBadWifi system API" am: 1aa810b0f3 am: edcf128bbc ... am: 9371bb2165 Change-Id: I8ff56380368a340162368ccbeefcae6df1ae549f Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 18:21:58 -08:00	416c04033e
Merge "Add getAvoidBadWifi system API" am: 1aa810b0f3 ... am: edcf128bbc Change-Id: Ide4ffc316c9301b795e8c0dabea3322aaf0b3184 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 17:53:09 -08:00	9371bb2165