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

3947 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
18f11cd4d7 Merge "Move NetworkUtils used by NetworkStack" 2019-01-28 06:57:25 +00:00
Remi NGUYEN VAN
77dd54d3d4 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
 2019-01-28 13:45:46 +09:00
Lorenzo Colitti
9b634f17a2 Merge "Add NetworkStack networking deps to SystemApi" 2019-01-28 02:58:01 +00:00
Remi NGUYEN VAN
ca1820bf2f Add NetworkStack networking deps to SystemApi 
Test: atest FrameworksNetTests
Bug: 112869080
Change-Id: Id59dc06fb85e4ac88098f56b621ec880610759ce
 2019-01-25 09:05:58 +09: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
fb54fde402 Merge "Revert "Whitelist packages from VPN lockdown."" am: 9f73671651 
am: 2f94ef95c4

Change-Id: I933a58f97b48f7a2db372cff6fb43318c840c6f8
 2019-01-24 13:58:15 -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
Irina Dumitrescu
b866a5b6e6 Merge "Add API for proxy configuration over VPN." am: 8b5917965d 
am: ac77629a1e

Change-Id: I51930e4ed99cc3df10db2c8bbef27989f0a06a46
 2019-01-24 10:20:32 -08:00
Pavel Grafov
52e0e403d2 Merge "Whitelist packages from VPN lockdown." am: efc773525c 
am: 295016b22b

Change-Id: I643fc2603f7cd2b928fe517eb473048004273835
 2019-01-24 10:06:37 -08: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
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
Remi NGUYEN VAN
60d32999db Merge "Add additional SystemApi for NetworkStack" am: 2ffdcc26b0 
am: aee43d2387

Change-Id: I5bdc50e7886731f61222bd1edd33765941118175
 2019-01-24 02:17:38 -08:00
Remi NGUYEN VAN
2ffdcc26b0 Merge "Add additional SystemApi for NetworkStack" 2019-01-24 09:55:01 +00:00
Remi NGUYEN VAN
50d8a03855 Merge "Add additional SystemApi for NetworkStack" 2019-01-24 07:37:52 +00: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
3dea854998 Merge changes from topic "ka05" am: b3656c7b1b 
am: 14e51c8a84

Change-Id: I08979872a03c52e933daa39730fd71e998272613
 2019-01-23 21:44:11 -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
Remi NGUYEN VAN
9a13aa9ffd Merge changes I1250730c,I7d00848c am: e693d49c0a 
am: 9026fb46cc

Change-Id: I31c9f6c11d0f52a34f68151fc2baca1921dcadad
 2019-01-23 08:40:50 -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
Remi NGUYEN VAN
299a7cc196 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
39fbb92bbb 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
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
Chalard Jean
dccea36b52 Merge "[MS11] Implement findL2Key" am: 773f3f5bf3 am: 21c8257178 
am: f1c3019d42

Change-Id: I768bc38b4f7d184842f49f6c0a5ac621020d2bd4
 2019-01-23 03:37:45 -08:00
Chalard Jean
f1c3019d42 Merge "[MS11] Implement findL2Key" am: 773f3f5bf3 
am: 21c8257178

Change-Id: I3005b92ab49ed79f854614281ef09fe5dbeea5c9
 2019-01-23 03:24:20 -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
Luke Huang
e052154abb Merge changes from topic "Java async dns" am: 31ff0616d1 
am: a8e16262f1

Change-Id: I305cf0ae791f9503519884bdf382863002357ac7
 2019-01-23 01:14:34 -08: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
3fb943a7b5 Merge "Add getAvoidBadWifi system API" am: 58582a36fc 
am: 656f2fa71a

Change-Id: Ide4ffc316c9301b795e8c0dabea3322aaf0b3184
 2019-01-22 17:53:09 -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
5da014a5fb Merge changes If71fadd2,I42047185 am: 022daeb874 
am: 6d1da29090

Change-Id: Id181b0c617c209bdf01ce25a8920d96025f8421d
 2019-01-22 15:20:30 -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
Remi NGUYEN VAN
7a037988d0 Merge "Migrate ICaptivePortal to stable AIDL" am: eb7c53718a 
am: d15930fc27

Change-Id: I6fa53f6f7c45aa801a1e48e04bdb3ca6004f565d
 2019-01-22 14:35:29 -08:00
Remi NGUYEN VAN
eb7c53718a Merge "Migrate ICaptivePortal to stable AIDL" 2019-01-22 22:03:44 +00:00
Tobias Thierer
3985258afd Merge "Deprecate SSLCertificateSocketFactory" am: f86156158c am: 6804819923 
am: 37db9722a6

Change-Id: I8e716337b30fa802a5b07f8f16421ad3a499720e
 2019-01-22 09:32:14 -08:00
Tobias Thierer
37db9722a6 Merge "Deprecate SSLCertificateSocketFactory" am: f86156158c 
am: 6804819923

Change-Id: Ib92af4ccfb66dc2bf261eb474d54e913bbcd96d8
 2019-01-22 09:22:30 -08:00
Tobias Thierer
f86156158c Merge "Deprecate SSLCertificateSocketFactory" 2019-01-22 16:57:50 +00:00