Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
401,606 Commits 3 Branches 0 Tags
4fcdce138f03b70754dc9549ee8eeeeb2c447e52
Commit Graph

1378 Commits

Author SHA1 Message Date
Chalard Jean
91dce9c9c7 Merge "Fix IPMS tests timeout." am: 1f9d80f6ee am: 618ff5185a 
am: d7bb3192af

Change-Id: I3c27bb789b8c44d6e2c46dabe65bf19452453257
 2019-01-24 16:55:28 -08:00
Treehugger Robot
1f9d80f6ee Merge "Fix IPMS tests timeout." 2019-01-25 00:15:50 +00:00
Dan Albert
fe1cdd047f resolve merge conflicts of fb54fde402 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
9f73671651 Merge "Revert "Whitelist packages from VPN lockdown."" 2019-01-24 21:08:46 +00:00
Dan Albert
ee8e6a0fae Revert "Whitelist packages from VPN lockdown." 
This reverts commit bb9cef04c5.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Iaf5c8aa4a8720eb2852da8cd91c81a77ccb92b68
 2019-01-24 21:05:39 +00:00
Treehugger Robot
8b5917965d Merge "Add API for proxy configuration over VPN." 2019-01-24 17:52:22 +00:00
Pavel Grafov
efc773525c Merge "Whitelist packages from VPN lockdown." 2019-01-24 17:34:55 +00:00
Pavel Grafov
bb9cef04c5 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
46165b5d61 Merge "Whitelist packages from VPN lockdown." 2019-01-24 16:15:08 +00:00
Irina Dumitrescu
044a436ac9 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
06928f4422 Merge "Add API for proxy configuration over VPN." 2019-01-24 15:09:18 +00:00
Irina Dumitrescu
18622d3d35 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
5fa8cb3802 Merge "Popup a notification after logging in the captive portal network" am: 6fa3d391b8 am: ff4106fc42 
am: 5b8b54cdcd

Change-Id: I62b9ef24f3a7f9fe75450a05d19dffda3b84d4b5
 2019-01-24 03:56:21 -08:00
Pavel Grafov
1d58621a1f 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
6fa3d391b8 Merge "Popup a notification after logging in the captive portal network" 2019-01-24 11:06:12 +00:00
Chalard Jean
f735efc833 Fix IPMS tests timeout. 
The tests used to correctly detect failures but would mostly wait
for timeout instead of succeeding immediately. If timeout were to
happen, that would not have been detected.

Test: atest IpMemoryStoreServiceTest
Change-Id: Ic1e7fcac3020739af7dc3e2c294d0838d8ffc711
 2019-01-24 19:34:39 +09:00
lucaslin
d2e045e040 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
Junyu Lai
0affe5dad2 Merge changes from topic "ka05" am: b3656c7b1b am: 14e51c8a84 
am: 3dea854998

Change-Id: Ie56c431a6d934c752d1de30fc4bf98a7e557e5b2
 2019-01-23 22:24:41 -08:00
Junyu Lai
b3656c7b1b 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
6ca2d0f4c1 Merge changes I1250730c,I7d00848c am: e693d49c0a am: 9026fb46cc 
am: 9a13aa9ffd

Change-Id: Icc938491a9c4474cc27a4376ef03c954aac461b3
 2019-01-23 09:01:09 -08:00
junyulai
215b877f11 [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
baed7690a2 Merge "Stop depending on the ConnectivityService default request." am: e62097f71d am: 15f89ada84 
am: 2dfe01def9

Change-Id: Ia3730d55442da165b779242a35c7c66bd0d9b8fe
 2019-01-23 08:36:21 -08:00
junyulai
48eac1d4c8 [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
e693d49c0a Merge changes I1250730c,I7d00848c 
* changes:
  Create a wrapper for IpClient
  Move IpClient to NetworkStack
 2019-01-23 15:05:00 +00:00
Lorenzo Colitti
e62097f71d Merge "Stop depending on the ConnectivityService default request." 2019-01-23 12:29:40 +00:00
Chalard Jean
dccea36b52 Merge "[MS11] Implement findL2Key" am: 773f3f5bf3 am: 21c8257178 
am: f1c3019d42

Change-Id: I768bc38b4f7d184842f49f6c0a5ac621020d2bd4
 2019-01-23 03:37:45 -08:00
Treehugger Robot
773f3f5bf3 Merge "[MS11] Implement findL2Key" 2019-01-23 11:01:43 +00:00
Luke Huang
d121dd2aa5 Merge changes from topic "Java async dns" am: 31ff0616d1 am: a8e16262f1 
am: e052154abb

Change-Id: I12f50513eee1c1cf3c908036fe80d3a3d8c373d0
 2019-01-23 01:24:21 -08:00
Lorenzo Colitti
ed3168e9e3 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
31ff0616d1 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
Chalard Jean
8d1a890c5c [MS11] Implement findL2Key 
Bug: 113554482
Test: old tests pass, new tests added
Change-Id: I2e93c88c30eae614a6db04abe698e8edf7fa6a43
 2019-01-23 16:54:37 +09:00
Remi NGUYEN VAN
3c600a15a1 Move IpClient to NetworkStack 
Test: atest FrameworksNetTests NetworkStackTests
Bug: b/112869080
Change-Id: I7d00848c052382cd1b6ce458868bed6a1e9e8ec5
 2019-01-23 16:44:21 +09:00
Remi NGUYEN VAN
cef9889b0d Merge "Add getAvoidBadWifi system API" am: 58582a36fc am: 656f2fa71a 
am: 3fb943a7b5

Change-Id: I8ff56380368a340162368ccbeefcae6df1ae549f
 2019-01-22 18:21:58 -08:00
Remi NGUYEN VAN
58582a36fc Merge "Add getAvoidBadWifi system API" 2019-01-23 01:13:01 +00:00
Chalard Jean
d068b9302a Merge changes If71fadd2,I42047185 am: 022daeb874 am: 6d1da29090 
am: 5da014a5fb

Change-Id: Ia91e6eac1b53fabb018fb4e1f689bb986e895ca4
 2019-01-22 15:29:37 -08:00
Chalard Jean
022daeb874 Merge changes If71fadd2,I42047185 
* changes:
  [MS10] Address leftover comments on MS03 and MS07
  [MS09] Implement isSameNetwork.
 2019-01-22 22:50:21 +00:00
Luke Huang
00b15f33ab 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
 2019-01-23 00:07:43 +08:00
Remi NGUYEN VAN
97f69c2f8d Add getAvoidBadWifi system API 
This helps remove the dependency on MultinetworkPolicyTracker from
IpClient.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: If56791dbed564772f25a859f301b8b52d84e38a3
 2019-01-22 15:57:34 +00:00
Pavel Grafov
18d0de7ecc Merge "Add API for VPN apps to query always-on and lockdown." am: 479c0769f1 am: 5fb1be5c0b 
am: 43c0ffc1b1

Change-Id: Ied8e5a01cdf76d8da02d2dc292943e6a559cc84e
 2019-01-22 07:19:18 -08:00
Pavel Grafov
479c0769f1 Merge "Add API for VPN apps to query always-on and lockdown." 2019-01-22 14:43:06 +00:00
Remi NGUYEN VAN
75df50dc83 Merge "Remove InterfaceController dependency on NMS" am: 06adb08d27 am: b6eb7e19e2 
am: f012b976f9

Change-Id: I7916f77c66d928bd1b1dd5616f2a478119263f2a
 2019-01-22 05:43:59 -08:00
Remi NGUYEN VAN
06adb08d27 Merge "Remove InterfaceController dependency on NMS" 2019-01-22 13:14:06 +00:00
Remi NGUYEN VAN
0a0dc38d8a Merge "Add LinkProps and NetworkCaps methods to SystemApi" am: 4bde11491b am: 563c545187 
am: 4293455fd1

Change-Id: I7e5a733b5c581679c0e50015205d9b8a3a2e8df2
 2019-01-22 03:54:23 -08:00
Remi NGUYEN VAN
d1b51a3228 Remove InterfaceController dependency on NMS 
Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: Ib3773068b087f58f4ac3394291cda132b00b2dcc
 2019-01-22 20:25:48 +09:00
Chalard Jean
b67e493653 [MS10] Address leftover comments on MS03 and MS07 
- Fix the copyright year in IPMSDatabase.java.
- Add missing Override annotations.
- Remove random l2keys, use fixed strings.
- Rename the method in OnNetworkAttributesRetrieved that puzzlingly
  nobody noticed was wrong.

Test: atest IpMemoryStoreServiceTest
Bug: 113554482
Change-Id: If71fadd23e158a4be299d112bfce75690b1ed8e8
 2019-01-22 19:10:48 +09:00
Chalard Jean
a39756a58a [MS09] Implement isSameNetwork. 
Test: Old tests pass, new tests pass too.
Bug: 113554482

Change-Id: I420471853f3fab7725cba7ae500cebdce1912e43
 2019-01-22 19:10:48 +09:00
Remi NGUYEN VAN
007322ecac Merge "Add NetworkStack metrics to system API" am: 8586a43f31 am: 2aa1bbe018 
am: 2f58858d1a

Change-Id: I848ac4c2bb8d35a2f756f97e57f9a61698c00f57
 2019-01-22 00:28:03 -08:00
Remi NGUYEN VAN
94a055737e Add LinkProps and NetworkCaps methods to SystemApi 
Added methods are used by the NetworkStack.

Test: atest FrameworksNetTests NetworkStackTests
Bug: 112869080
Change-Id: I8822d43c1a4981ca39289525685b3f975fb0e8d5
 2019-01-22 16:57:16 +09:00
Remi NGUYEN VAN
8586a43f31 Merge "Add NetworkStack metrics to system API" 2019-01-22 07:48:39 +00:00
Remi NGUYEN VAN
8bddc8fc4e Merge "Fix lint errors for moving IpClient to NetworkStack" am: 9325fbc4f8 am: 3d7914e98b 
am: cd2dc71a8a

Change-Id: Iea48be6bcfca67cf702b2bb3f4b0ed5f44ec40eb
 2019-01-21 23:40:32 -08:00