Dan Albert
61bb568007
resolve merge conflicts of d7f2320945 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
d7f2320945
Merge "Revert "Whitelist packages from VPN lockdown."" am: 0246fc7f38
...
am: 3ffcc2d808
Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8
2019-01-24 13:58:15 -08:00
Dan Albert
3ffcc2d808
Merge "Revert "Whitelist packages from VPN lockdown.""
...
am: 0246fc7f38
Change-Id: Ibaf799dc2664a6b3b743030da956679a3414ad9d
2019-01-24 13:45:19 -08:00
Dan Albert
0246fc7f38
Merge "Revert "Whitelist packages from VPN lockdown.""
2019-01-24 21:08:46 +00:00
Dan Albert
bc9dd2b1aa
Revert "Whitelist packages from VPN lockdown."
...
This reverts commit b66ec9bbf7 .
Reason for revert: broke pi-dev-plus-aosp
Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68
2019-01-24 21:05:39 +00:00
Irina Dumitrescu
a3a46d342b
[automerger skipped] Merge "Add API for proxy configuration over VPN." am: a72ef3ff55 am: 6ff618c944
...
am: 6cbfaa5bb4 -s ours
am skip reason: change_id Id4dde4a4103fd93bfbbacc52d0e5ade56ae67a6a with SHA1 3a83884883 is in history
Change-Id: I1b5f49892d2ff473b5fe7d3d1e71e3cd3ffaca26
2019-01-24 11:14:25 -08:00
Pavel Grafov
532c1974a5
[automerger skipped] Merge "Whitelist packages from VPN lockdown." am: 5bc0c4f1ca am: abc3e7bd1f
...
am: cd5753de76 -s ours
am skip reason: change_id I7f6c5b9172063b588feacd6b9930a6cb88f764ab with SHA1 a2f5288aed is in history
Change-Id: I56f2eadd2e95a74897d7e17cb21d672e747b8261
2019-01-24 11:00:58 -08:00
Irina Dumitrescu
6cbfaa5bb4
Merge "Add API for proxy configuration over VPN." am: a72ef3ff55
...
am: 6ff618c944
Change-Id: I51930e4ed99cc3df10db2c8bbef27989f0a06a46
2019-01-24 10:20:32 -08:00
Irina Dumitrescu
6ff618c944
Merge "Add API for proxy configuration over VPN."
...
am: a72ef3ff55
Change-Id: I647aec5f7678668b8ef7d616150adac1086dbbdd
2019-01-24 10:08:07 -08:00
Pavel Grafov
cd5753de76
Merge "Whitelist packages from VPN lockdown." am: 5bc0c4f1ca
...
am: abc3e7bd1f
Change-Id: I643fc2603f7cd2b928fe517eb473048004273835
2019-01-24 10:06:37 -08:00
Treehugger Robot
a72ef3ff55
Merge "Add API for proxy configuration over VPN."
2019-01-24 17:52:22 +00:00
Pavel Grafov
abc3e7bd1f
Merge "Whitelist packages from VPN lockdown."
...
am: 5bc0c4f1ca
Change-Id: I329e24f1359a11a72ae9d0a23d2dc5b5de5aa8a7
2019-01-24 09:49:42 -08:00
Pavel Grafov
5bc0c4f1ca
Merge "Whitelist packages from VPN lockdown."
2019-01-24 17:34:55 +00:00
Pavel Grafov
b66ec9bbf7
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
a7789bb2f0
Merge "Whitelist packages from VPN lockdown."
2019-01-24 16:15:08 +00:00
Irina Dumitrescu
0eafa0b5c8
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
4601fb3171
Merge "Add API for proxy configuration over VPN."
2019-01-24 15:09:18 +00:00
Irina Dumitrescu
3a83884883
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
9109b27996
Merge "Popup a notification after logging in the captive portal network" am: 08bf40cfd1 am: 0c3a341e99
...
am: d2b0ad1fb5
Change-Id: I62b9ef24f3a7f9fe75450a05d19dffda3b84d4b5
2019-01-24 03:56:21 -08:00
Lucas Lin
d2b0ad1fb5
Merge "Popup a notification after logging in the captive portal network" am: 08bf40cfd1
...
am: 0c3a341e99
Change-Id: I46598799c8a21d986d1790afc5c4b01726081e97
2019-01-24 03:41:40 -08:00
Pavel Grafov
a2f5288aed
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
0c3a341e99
Merge "Popup a notification after logging in the captive portal network"
...
am: 08bf40cfd1
Change-Id: I78321e10014525dfb02da29ee2f3cd4487bf30db
2019-01-24 03:27:36 -08:00
Lucas Lin
08bf40cfd1
Merge "Popup a notification after logging in the captive portal network"
2019-01-24 11:06:12 +00:00
Remi NGUYEN VAN
26c1533beb
[automerger skipped] Merge "Add additional SystemApi for NetworkStack" am: 962a145379 am: a60b0e6188
...
am: 371d617c4b -s ours
am skip reason: change_id I8b5b80ea7b267357eb0387d504a2f78358d6d502 with SHA1 76be7232a7 is in history
Change-Id: I023f2b404c2444289ddb016a88b731e6813b7edb
2019-01-24 02:31:56 -08:00
Remi NGUYEN VAN
371d617c4b
Merge "Add additional SystemApi for NetworkStack" am: 962a145379
...
am: a60b0e6188
Change-Id: I5bdc50e7886731f61222bd1edd33765941118175
2019-01-24 02:17:38 -08:00
Remi NGUYEN VAN
a60b0e6188
Merge "Add additional SystemApi for NetworkStack"
...
am: 962a145379
Change-Id: I2614b1484498ad9d285be5f6628a94983f1561e4
2019-01-24 02:06:15 -08:00
Remi NGUYEN VAN
962a145379
Merge "Add additional SystemApi for NetworkStack"
2019-01-24 09:55:01 +00:00
lucaslin
1ac7239053
Popup a notification after logging in the captive portal network
...
Captive portal app will be auto dismissed after user login the
captive portal network. In order to improve the user experience,
popup a notification to notify user that the captive portal
network is connected.
Bug: 113629026
Test: 1.atest FrameworksNetTests:NetworkNotificationManagerTest
2.Connect to a captive portal network and login, check if
there is a notification popup.
Change-Id: Id54d12268e107af2f213c2bb348c5f7908e880f4
2019-01-24 15:55:30 +08:00
Remi NGUYEN VAN
0d7fd388a6
Merge "Add additional SystemApi for NetworkStack"
2019-01-24 07:37:52 +00:00
Junyu Lai
56277ab83f
Merge changes from topic "ka05" am: 908eb08326 am: 9a4614f4b0
...
am: ee5162e5b5
Change-Id: Ie56c431a6d934c752d1de30fc4bf98a7e557e5b2
2019-01-23 22:24:41 -08:00
Junyu Lai
ee5162e5b5
Merge changes from topic "ka05" am: 908eb08326
...
am: 9a4614f4b0
Change-Id: I08979872a03c52e933daa39730fd71e998272613
2019-01-23 21:44:11 -08:00
Junyu Lai
9a4614f4b0
Merge changes from topic "ka05"
...
am: 908eb08326
Change-Id: I2448348d1501ca50daac87f4c06c120b4de3b2ae
2019-01-23 21:24:06 -08:00
Junyu Lai
908eb08326
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
2019-01-24 05:06:39 +00:00
Remi NGUYEN VAN
80d745af3a
Merge changes I1250730c,I7d00848c am: c391533617 am: 0e12b04421
...
am: 1cb4137701
Change-Id: Icc938491a9c4474cc27a4376ef03c954aac461b3
2019-01-23 09:01:09 -08:00
Remi NGUYEN VAN
1cb4137701
Merge changes I1250730c,I7d00848c am: c391533617
...
am: 0e12b04421
Change-Id: I31c9f6c11d0f52a34f68151fc2baca1921dcadad
2019-01-23 08:40:50 -08:00
junyulai
48a5938ee8
[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
2019-01-24 00:40:25 +08:00
Lorenzo Colitti
ce00c34e01
Merge "Stop depending on the ConnectivityService default request." am: af9048348f am: db0eb579ee
...
am: 237cbb7b83
Change-Id: Ia3730d55442da165b779242a35c7c66bd0d9b8fe
2019-01-23 08:36:21 -08:00
Remi NGUYEN VAN
0e12b04421
Merge changes I1250730c,I7d00848c
...
am: c391533617
Change-Id: I2f19490a2340bdc2630162dfe9a277dffc5041fa
2019-01-23 08:26:33 -08:00
Lorenzo Colitti
237cbb7b83
Merge "Stop depending on the ConnectivityService default request." am: af9048348f
...
am: db0eb579ee
Change-Id: I93532a44b070dfbca74e8b68c3e26aa96ed5c480
2019-01-23 08:25:19 -08:00
Lorenzo Colitti
db0eb579ee
Merge "Stop depending on the ConnectivityService default request."
...
am: af9048348f
Change-Id: Iae908cb959d50870923bce4dbe1bfed5f4c26c2c
2019-01-23 08:14:33 -08:00
Remi NGUYEN VAN
155b7b7342
Add additional SystemApi for NetworkStack
...
Members in this CL were missed in earlier changes.
Test: m
Bug: 112869080
Merged-In: I8b5b80ea7b267357eb0387d504a2f78358d6d502
Change-Id: I8b9b15f8b91962f3ef554fd222a825e471806c9e
2019-01-24 01:01:13 +09:00
Remi NGUYEN VAN
76be7232a7
Add additional SystemApi for NetworkStack
...
Members in this CL were missed in earlier changes.
Test: m
Bug: 112869080
Change-Id: I8b5b80ea7b267357eb0387d504a2f78358d6d502
2019-01-24 00:55:43 +09:00
junyulai
a86defca11
[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
2019-01-23 23:17:17 +08:00
Remi NGUYEN VAN
c391533617
Merge changes I1250730c,I7d00848c
...
* changes:
Create a wrapper for IpClient
Move IpClient to NetworkStack
2019-01-23 15:05:00 +00:00
Lorenzo Colitti
af9048348f
Merge "Stop depending on the ConnectivityService default request."
2019-01-23 12:29:40 +00:00
Luke Huang
143fdd80bb
Merge changes from topic "Java async dns" am: 8c684211f0 am: 10fb7d86f8
...
am: 4757e61c18
Change-Id: I12f50513eee1c1cf3c908036fe80d3a3d8c373d0
2019-01-23 01:24:21 -08:00
Luke Huang
4757e61c18
Merge changes from topic "Java async dns" am: 8c684211f0
...
am: 10fb7d86f8
Change-Id: I305cf0ae791f9503519884bdf382863002357ac7
2019-01-23 01:14:34 -08:00
Lorenzo Colitti
4d4798edba
Stop depending on the ConnectivityService default request.
...
This avoids the need to expose ConnectivityService implementation
details as @SystemApi and the complexities that would be required
to make NetworkCapabilities parcelable in stable AIDL.
Bug: 112869080
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Icd5d25b9b8e9b7a7d1899b000c92dc4976c3b3d7
2019-01-23 18:10:06 +09:00
Luke Huang
10fb7d86f8
Merge changes from topic "Java async dns"
...
am: 8c684211f0
Change-Id: Ia08a8300887315d673f398b1340b2f44ce501b14
2019-01-23 01:06:19 -08:00
Luke Huang
8c684211f0
Merge changes from topic "Java async dns"
...
* changes:
Add asynchronous DNS query API in Java
Add jni method for DnsResolver
2019-01-23 08:48:23 +00:00