Message	SHA1
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
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	9cfced4623
Merge "Add getAvoidBadWifi system API" am: eafed7dcba am: 7afbd81a03 ... am: 86709f4871 Change-Id: I8ff56380368a340162368ccbeefcae6df1ae549f Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 18:21:58 -08:00	5442118261
Merge "Add getAvoidBadWifi system API" am: eafed7dcba ... am: 7afbd81a03 Change-Id: Ide4ffc316c9301b795e8c0dabea3322aaf0b3184 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 17:53:09 -08:00	86709f4871
Merge "Add getAvoidBadWifi system API" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-23 01:13:01 +00:00	eafed7dcba
Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a ... am: b43fd41baa Change-Id: I6fa53f6f7c45aa801a1e48e04bdb3ca6004f565d Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 14:35:29 -08:00	e4ce181b98
Add asynchronous DNS query API in Java ... DnsResolver for asynchronous DNS querying DnsPacket for parsing answer Test: built, flashed, booted atest DnsResolverTest atest DnsPacketTest Change-Id: Id014bc7387dd940cfaa270f68e7d4d85fab320a0 Luke Huang   commited 2019-01-23 00:07:43 +08:00	2f6112a31a
Add jni method for DnsResolver ... Test: built, flashed, booted atest DnsResolverTest Change-Id: Iff730ec918f4db1ba0216f90a12550fe26e271d0 Luke Huang   commited 2019-01-23 00:07:43 +08:00	577b2e31fc
Add getAvoidBadWifi system API ... This helps remove the dependency on MultinetworkPolicyTracker from IpClient. Test: atest FrameworksNetTests NetworkStackTests Bug: 112869080 Change-Id: If56791dbed564772f25a859f301b8b52d84e38a3 Remi NGUYEN VAN   commited 2019-01-22 15:57:34 +00:00	3436b6ffd9
Migrate ICaptivePortal to stable AIDL ... Also add required API for the captive portal app to stop using hidden members. Test: atest FrameworksNetTests NetworkStackTests Bug: 112869080 Merged-In: I62b457e709fa199822bb8f80b0eab990be4ded93 Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93 Remi NGUYEN VAN   commited 2019-01-23 00:53:13 +09:00	48bc72ac38
Merge "Migrate ICaptivePortal to stable AIDL" Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2019-01-22 15:38:07 +00:00	c66564f296
Merge "Add API for VPN apps to query always-on and lockdown." am: c9ea55c3f7 am: 721dbccad1 ... am: ec53cd06b0 Change-Id: Ied8e5a01cdf76d8da02d2dc292943e6a559cc84e Pavel Grafov   authored and   android-build-merger   commited 2019-01-22 07:19:18 -08:00	833939a5c9
Merge "Add API for VPN apps to query always-on and lockdown." am: c9ea55c3f7 ... am: 721dbccad1 Change-Id: I48f3441f06af2a69776eacc5ee52463873739bdb Pavel Grafov   authored and   android-build-merger   commited 2019-01-22 07:09:43 -08:00	ec53cd06b0
Merge "Add API for VPN apps to query always-on and lockdown." Pavel Grafov   authored and   Gerrit Code Review   commited 2019-01-22 14:43:06 +00:00	c9ea55c3f7
Migrate ICaptivePortal to stable AIDL ... Also add required API for the captive portal app to stop using hidden members. Test: atest FrameworksNetTests NetworkStackTests Bug: 112869080 Change-Id: I62b457e709fa199822bb8f80b0eab990be4ded93 Remi NGUYEN VAN   commited 2019-01-22 21:16:47 +09:00	e0bc140f97
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: e090d600c5 ... am: 66c8e76081 Change-Id: I7e5a733b5c581679c0e50015205d9b8a3a2e8df2 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 03:54:23 -08:00	125e15852f
Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b ... am: e090d600c5 Change-Id: Ic15474fe0b7da8062114367ec4f692e30e73d549 Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-22 03:27:36 -08:00	66c8e76081
Add LinkProps and NetworkCaps methods to SystemApi ... Added methods are used by the NetworkStack. Test: atest FrameworksNetTests NetworkStackTests Bug: 112869080 Change-Id: I8822d43c1a4981ca39289525685b3f975fb0e8d5 Remi NGUYEN VAN   commited 2019-01-22 16:57:16 +09:00	048c9413e6
Merge "Add NetworkMonitor constants to SystemApi" am: 591de4579d ... am: b78f2a5d68 Change-Id: I0281ff981cbd5d26a2f2874db23244bebad9c66b Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-01-21 19:25:05 -08:00	c90d59e401
Merge "Add NetworkMonitor constants to SystemApi" Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-01-22 03:03:37 +00:00	591de4579d
Merge "Add NetworkMonitor constants to SystemApi" Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2019-01-22 01:46:12 +00:00	ea76c43d5a