Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
402,161 Commits 3 Branches 0 Tags
7c8d2e79a7ca0724b246f009dfdcdca337188083
Commit Graph

3974 Commits

Author SHA1 Message Date
Roshan Pius
5af35cba45 Merge "WifiNetworkConfigBuilder: Split into 2 separate builders" 2019-01-29 18:25:21 +00:00
Roshan Pius
3409263cba WifiNetworkConfigBuilder: Split into 2 separate builders 
Split the existing WifiNetworkConfigBuilder into 2 separate builders,
one for building WifiNetworkSuggestion and one for WifiNetworkSpecifier.

Other changes in the CL:
a) Marked the constructor of the abstract NetworkSpecifier class public
to allow WifiNetworkSpecifier.Builder() (& hence WifiNetworkSpecifier) to
be public. The alternative is to put the builder for WifiNetworkSpecifier
in some other file (like WifiManager)
b) Mark WifiNetworkSpecifier class public to make it's builder visible.
c) Modify the documentation (& usage example) for WifiNetworkSpecifier
builder to explicitly call out that this can only be used for a local
wifi connection (i.e no internet capability).

Bug: 123313291
Test: ./frameworks/base/wifi/tests/runtests.sh
Test: make docs
Change-Id: I1a5fcff886124010222e112dbca92797a514b6d9
 2019-01-29 10:23:46 -08:00
Chalard Jean
287da6be9d Merge "Move FdEventsReader to the shared area." am: 4a838a68d6 am: 06318332ef 
am: 04c1e6533b

Change-Id: I6f08c2a2fb43ca34297a1e3289fca9da7cfe7213
 2019-01-29 04:34:56 -08:00
Chalard Jean
04c1e6533b Merge "Move FdEventsReader to the shared area." am: 4a838a68d6 
am: 06318332ef

Change-Id: I0f4418b73b455f9b37ae8f5b2ca1a19884c51ff9
 2019-01-29 04:20:52 -08:00
Remi NGUYEN VAN
d0c4680e12 Merge "Add utils connect, setsockopt, bind, sendTo" am: 1e002eede3 am: dfa16fe772 
am: 031e0aa44e

Change-Id: I7a1f7071d7b13b5e92fdf1af1686abdd8ceea3d6
 2019-01-29 03:53:19 -08:00
Treehugger Robot
4a838a68d6 Merge "Move FdEventsReader to the shared area." 2019-01-29 11:45:15 +00:00
Remi NGUYEN VAN
6922228cd9 Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe am: ca1d65e707 
am: 08747c5ccb

Change-Id: Ib755bbfc5bb6bff4ada3995b70dfe8fc2d40b4f9
 2019-01-29 03:39:27 -08:00
Remi NGUYEN VAN
031e0aa44e Merge "Add utils connect, setsockopt, bind, sendTo" am: 1e002eede3 
am: dfa16fe772

Change-Id: Ib5ebe3134fb1d53581b9d91b4f4f142afb5e9fb3
 2019-01-29 03:34:23 -08:00
Remi NGUYEN VAN
08747c5ccb Merge "Add NetworkUtils utilities to SystemApi" am: 9cc31061fe 
am: ca1d65e707

Change-Id: I978bdb626c1f4c8bbe736c8bad1c74fb6a67b4b5
 2019-01-29 03:29:01 -08:00
Chalard Jean
0bf364d92e Move FdEventsReader to the shared area. 
This is necessary both in the network stack app and the
framework.

Test: FrameworksNetTests
Change-Id: I48af0ab29405501f0581a6c0c9ce6e5d4a32c8b4
 2019-01-29 18:35:11 +09:00
Remi NGUYEN VAN
249da094eb Add utils connect, setsockopt, bind, sendTo 
The utilities are not supported as public API but required as SystemApi
for the NetworkStack.

Test: flashed, boots, WiFi works
Bug: 112869080
Change-Id: Ia64b3bf9c6c33cf61bed76469ea9963b550bed2b
 2019-01-29 17:49:36 +09:00
Remi NGUYEN VAN
5c5f1ba99c Add NetworkUtils utilities to SystemApi 
attach*Filter and addArpEntry are necessary for the NetworkStack but are
only usable for apps that have system permissions.
Also includes system API for IpPrefix, LinkAddress, LinkProperties,
Network, and static modifier in ApfCapabilities that were missed in
previous CLs.

Test: Builds, flashed, WiFi works
Bug: 112869080
Change-Id: If141ae6a2f9145f5af64ba002ca44938f39b90a9
 2019-01-29 17:30:26 +09:00
Remi NGUYEN VAN
5b8ef04f36 Merge "Add SocketUtils for NetworkStack" am: cec60fa56a am: 27ae908282 
am: ca7c41f5fa

Change-Id: I6d059f9cd1a694659bfd7ac09a32022d29c03f85
 2019-01-28 23:47:36 -08:00
Remi NGUYEN VAN
ca7c41f5fa Merge "Add SocketUtils for NetworkStack" am: cec60fa56a 
am: 27ae908282

Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9
 2019-01-28 22:57:39 -08:00
Pavel Grafov
1f47ab08c1 Merge "Whitelist packages from VPN lockdown." am: 774c3ce152 am: b478bb25ac 
am: 2b996ad0dd

Change-Id: Ice1f8f27da3d0092af58c8e93969575ba9f8f925
 2019-01-28 22:13:24 -08:00
Pavel Grafov
2b996ad0dd Merge "Whitelist packages from VPN lockdown." am: 774c3ce152 
am: b478bb25ac

Change-Id: I10094606f74e6cdc5f4b0b6591cf776fd895b1d3
 2019-01-28 21:34:03 -08:00
Remi NGUYEN VAN
cec60fa56a Merge "Add SocketUtils for NetworkStack" 2019-01-28 23:14:08 +00:00
Pavel Grafov
774c3ce152 Merge "Whitelist packages from VPN lockdown." 2019-01-28 20:15:49 +00:00
Junyu Lai
f75556a089 Merge "Hide Keepalive offload API in IpSec" 2019-01-28 15:18:29 +00:00
Remi NGUYEN VAN
53b03140d4 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
 2019-01-28 20:11:27 +09:00
Remi NGUYEN VAN
9a77141364 Merge "Move NetworkUtils used by NetworkStack" am: b8bbc48dee 
am: 4c5b40e084

Change-Id: I0d6a40c79e92d1de18c41cc50b72fbe33db13bdc
 2019-01-28 01:30:17 -08:00
Remi NGUYEN VAN
b8bbc48dee Merge "Move NetworkUtils used by NetworkStack" 2019-01-28 09:06:20 +00:00
Remi NGUYEN VAN
f6a3b910bb Merge "Add NetworkStack networking deps to SystemApi" am: 9188b49259 
am: bc7a8f14f4

Change-Id: I843cb189750666a2cb70b1960d49dfe797f3cf36
 2019-01-28 00:35:46 -08:00
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
Remi NGUYEN VAN
e88516f13b 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
 2019-01-28 13:45:17 +09:00
Remi NGUYEN VAN
a4bcc86dbe 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
 2019-01-28 13:28:35 +09:00
Lorenzo Colitti
9b634f17a2 Merge "Add NetworkStack networking deps to SystemApi" 2019-01-28 02:58:01 +00:00
Pavel Grafov
a462bcb9c4 Whitelist packages from VPN lockdown. 
Bug: 77468593
Test: atest com.android.server.connectivity.VpnTest
Change-Id: I9119c139ab07a761ce5dfd1365b70eb905fd32dc
 2019-01-25 19:59:03 +00:00
junyulai
3a4675572d Hide Keepalive offload API in IpSec 
Since the new keepalive API is exported in ConnectivityManager,
hide Keepalive API in IpSec, also make system-current.txt sync
for this part.

Bug: 114151147
Test: m -j
Change-Id: I076030bdbab1cd7d69f6a034577d529970b050dc
 2019-01-25 14:41:19 +08: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