Commit graph android_packages_modules_Co.../core
Message SHA1
Merge "[CM] Fix NPE due to unvalidated callback value" am: ca7356d684
am: 51ddc176ab

Change-Id: Idf439c1f6badd715776eaaced1a781b066ba6d37

Etan Cohen   authored and   android-build-merger   commited 2019-05-22 10:44:37 -07:00
407e5ecdaa
Merge "[CM] Fix NPE due to unvalidated callback value"
Etan Cohen   authored and   Gerrit Code Review   commited 2019-05-22 13:53:31 +00:00
ca7356d684
Merge "Update throws documentation for requestNetwork*" into qt-dev
Chalard Jean   authored and   Android (Google) Code Review   commited 2019-05-22 13:42:29 +00:00
f61ee3d086
Update throws documentation for requestNetwork*
Bug: 78126688
Test: builds
Change-Id: Iaabcc52b3e6537752990b88a24e11217f73ce8e7
(cherry picked from commit 75f1329f927202f39ae29d2acaad97d01f5c8cb8)
Merged-In: I8b5bb052bf73feed0dfafafaf44fcd07f58186ce

Chalard Jean   commited 2019-05-22 12:02:51 +00:00
5745361291
Let clients access StaticIpConfiguration members through reflection.
Bug: 131764329
Test: none
Change-Id: Ice5c4fd4d469a55410129310c5a25874b94e2219
(cherry picked from commit 6736fb0465e3cc9f38ee1340e6b831a6dcd195e8)
Merged-In: I0fa84390f6c289571afa9d86cb922835fe2b7e77

Chalard Jean   commited 2019-05-22 12:01:31 +00:00
d816bfe886
Merge "Update throws documentation for requestNetwork*" am: 7410a7d503
am: 411f1efc02

Change-Id: Iaabcc52b3e6537752990b88a24e11217f73ce8e7

Chalard Jean   authored and   android-build-merger   commited 2019-05-22 02:55:10 -07:00
4faf3ff79b
Merge "Let clients access StaticIpConfiguration members through reflection." am: c33fc9bbe3
am: 892038673e

Change-Id: Ice5c4fd4d469a55410129310c5a25874b94e2219

Chalard Jean   authored and   android-build-merger   commited 2019-05-22 02:42:25 -07:00
755816500a
Merge "Update throws documentation for requestNetwork*"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-05-22 08:34:43 +00:00
7410a7d503
Merge "Let clients access StaticIpConfiguration members through reflection."
Chalard Jean   authored and   Gerrit Code Review   commited 2019-05-22 07:17:52 +00:00
c33fc9bbe3
[CM] Fix NPE due to unvalidated callback value
When unregistering callback due to ON_UNAVAILABLE did not check for
a non-null callback.

Bug: 132950880
Test: atest ConnectivityServiceTest
Change-Id: I8f3322963f322e6690f1403681bf66e8b38b35f8

Etan Cohen   commited 2019-05-22 04:56:09 +00:00
bc3a4eb54c
Merge "Move keepalive constants to their right place" am: 06df06fdaf
am: 292f73b0dc

Change-Id: Id45981af5b42ec1423aff8b0ec1bc07d7c71c6b9

junyulai   authored and   android-build-merger   commited 2019-05-20 22:09:19 -07:00
88396a8cd5
Move keepalive constants to their right place
The constants CMD_{ADD,REMOVE}_KEEPALIVE_PACKET_FILTER are too
high in the file and not in order. These constants should be
moved back to their rightful place.

Bug: 123987395
Test: 1. m -j 2. m -j doc-comment-check-docs
Change-Id: I44c827d3a2011cf7c66c0444566e14192fec1b1b

junyulai   authored and   Junyu Lai   commited 2019-05-21 00:23:41 +00:00
a6b6fceb15
Let clients access StaticIpConfiguration members through reflection.
Bug: 131764329
Test: none
Change-Id: I0fa84390f6c289571afa9d86cb922835fe2b7e77

Chalard Jean   commited 2019-05-20 16:58:08 +09:00
3ce2a06f57
Update throws documentation for requestNetwork*
Bug: 78126688
Test: builds
Change-Id: I8b5bb052bf73feed0dfafafaf44fcd07f58186ce

Chalard Jean   commited 2019-05-14 22:16:29 +09:00
9f1a7631bb
Support customization of supported keepalive count per transport
This change specifies the required minimum supported keepalives
in SDK, and allows OEMs to customize supported keepalive count
per network through resource overlay.

Bug: 129371366
Test: 1. m -j doc-comment-check-docs
      2. atest FrameworksNetTests

Clean cherry-pick of aosp/946359

Change-Id: I06840834d0ee8121358bf4829fe47ecf9964d395
Merged-In: I0218f3674628c13ead63fc9a873895ba7f113033
Merged-In: Ia667386c1a8949839871a6949d79552d9c8b88f0

junyulai   authored and   Chalard Jean   commited 2019-05-13 15:52:07 +09:00
2f2f0155f1
Merge changes Ibcb91105,I0218f367 am: c797cf56ca
am: 0d58710edf

Change-Id: Ia667386c1a8949839871a6949d79552d9c8b88f0

Junyu Lai   authored and   android-build-merger   commited 2019-05-10 02:13:34 -07:00
8bb3db8837
Merge changes Ibcb91105,I0218f367
* changes:
  Limit unprivileged keepalives per uid
  Support customization of supported keepalive count per transport

Junyu Lai   authored and   Gerrit Code Review   commited 2019-05-10 05:47:23 +00:00
c797cf56ca
Support customization of supported keepalive count per transport
This change specifies the required minimum supported keepalives
in SDK, and allows OEMs to customize supported keepalive count
per network through resource overlay.

Bug: 129371366
Test: 1. m -j doc-comment-check-docs
      2. atest FrameworksNetTests

Change-Id: I0218f3674628c13ead63fc9a873895ba7f113033

junyulai   commited 2019-05-10 00:36:58 +08:00
15e26fb485
Merge "[CS] Unregister callback as part of onUnavailable dispatch" into qt-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2019-05-09 09:42:38 +00:00
d9b68e236b
Merge "[CS] Unregister callback as part of onUnavailable dispatch" am: 3b9087c59f
am: b0e0a62bf6

Change-Id: Ida684c441e7aaedce9a29da071ef5a68403d08b3

Etan Cohen   authored and   android-build-merger   commited 2019-05-08 22:42:55 -07:00
095e5675df
[CS] Unregister callback as part of onUnavailable dispatch
The onUnavailable semantics promise that it is equivalent to calling
the unregister callback method. But - it doesn't unregister the callback
allowing it to be reused. Fixed.

Additionally, modified the unregisterNetworkCallback method to not fail
on duplicate unregistration (since a callback could now self
unregister). Instead simply print a log.

Bug: 130651445
Test: atest ConnectivityServiceTest
Merged-In: I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3
Change-Id: I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3

Etan Cohen   commited 2019-05-09 03:57:54 +00:00
83ab6999c8
[CS] Unregister callback as part of onUnavailable dispatch
The onUnavailable semantics promise that it is equivalent to calling
the unregister callback method. But - it doesn't unregister the callback
allowing it to be reused. Fixed.

Additionally, modified the unregisterNetworkCallback method to not fail
on duplicate unregistration (since a callback could now self
unregister). Instead simply print a log.

Bug: 130651445
Test: atest ConnectivityServiceTest
Change-Id: I4c54b003a733eb0b1e4fd8674ed13081b1bef8e3

Etan Cohen   commited 2019-05-09 02:41:40 +00:00
e0e2ca979c
Correct buffer size limitation for DnsResolver API
Bug: 131055651
Test: atest DnsResolverTest
(cherry picked from commit f6726c2c5456887aaebe3f821a86a83bbed92f3d)

Change-Id: I69ad9428ddfb70437e47ef4740930a97aece69d9

Luke Huang   commited 2019-05-02 09:37:13 +00:00
1d3e7b19b8
Merge "Correct buffer size limitation for DnsResolver API" am: 0e1b6c1cda
am: 988a45767e

Change-Id: If779ada4dbc1e67b28067235f5055d7f94692c69

Luke Huang   authored and   android-build-merger   commited 2019-05-01 23:39:32 -07:00
08835ef728
Correct buffer size limitation for DnsResolver API
Bug: 131055651
Test: atest DnsResolverTest
Change-Id: I29decd480172eacb452ccb0da524ef1bf2ffadcf

Luke Huang   commited 2019-05-02 11:48:54 +08:00
abf0cd31c8
Merge changes from topic "natt-aidl+aidl-freeze" into qt-dev
* changes:
  Add AIDL parcelable for NattKeepalivePacketData
  Move NattKeepalivePacketData out of the framework

TreeHugger Robot   authored and   Android (Google) Code Review   commited 2019-04-29 16:26:23 +00:00
d665afbc4b
Move NattKeepalivePacketData out of the framework
For implementing parcelable interface for NattKeepalivePacketData.
Move this class out of framework.jar and move to services.jar

This class is used in telephony-common.jar and it also loads
service.jar.

Bug: 33530442
Test: - build pass
      - atest NetworkStackTests
      - atest ConnectivityServiceTest

Change-Id: Ie1d02bb7bccb76415cf71824147466cabf6b88b6
Merged-In: Ie1d02bb7bccb76415cf71824147466cabf6b88b6
Merged-In: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4
(cherry picked from commit 58a1f931eba8716c4a630863f658b070cda623de)

Aaron Huang   authored and   markchien   commited 2019-04-29 20:24:24 +08:00
b7b9aa697a
Block incoming non-VPN packets to apps under fully-routed VPN
When a fully-routed VPN is running, we want to prevent normal apps
under the VPN from receiving packets originating from any local non-VPN
interfaces. This is achieved by using eBPF to create a per-UID input
interface whitelist and populate the whitelist such that all
non-bypassable apps under a VPN can only receive packets from the VPN's
TUN interface (and loopback implicitly)

This is the framework part of the change that build the whitelist.
The whitelist needs to be updated in the following cases:
* When a VPN is connected and disconnected
    This will cover the change to allowBypass bit, since that can't be
    changed without reconnecting.
* When a VPN's NetworkCapabilites is changed (whitelist/blacklist app changes)
* When a new app is installed
* When an existing app is removed
* When a VPN becomes fully-routed or is no longer fully-routed

New user/profile creation will automatically result in a whitelist app change
transition so it doesn't need to be handled specially here.

Due to the limitation of the kernel IPSec interacting with eBPF (sk_buf->ifindex
does not point to the virtual tunnel interface for kernel IPSec), the whitelist
will only apply to app VPNs but not legacy VPN connections, to prevent breaking
connectivity with kernel IPSec entirely.

Test: atest PermissionMonitorTest
Test: atest android.net.RouteInfoTest
Test: atest com.android.server.ConnectivityServiceTest
Test: atest HostsideVpnTests
Bug: 114231106

Merged-In: I5af81bc80dadd086261ba4b1eb706cc873bb7cfa
Change-Id: I5af81bc80dadd086261ba4b1eb706cc873bb7cfa
(cherry picked from commit c81642f1a1)

Rubin Xu   commited 2019-04-24 11:56:46 +01:00
4158c568b8
Merge "Move NattKeepalivePacketData out of the framework" am: 7640cb0157
am: 7abf8c5880

Change-Id: Idf7c25b6b553d8c0cc4ef2ea8193438480420fb4

Aaron Huang   authored and   android-build-merger   commited 2019-04-23 21:26:03 -07:00
1465573044
Merge "Move NattKeepalivePacketData out of the framework"
Aaron Huang   authored and   Gerrit Code Review   commited 2019-04-24 04:00:56 +00:00
7640cb0157
Merge "Add configurability of LinkProperties, meteredness for Test Networks" am: c704b9fd07
am: b19bf0b92d

Change-Id: I9c8220efd56f72aabae028b48ac2f88ec7b8f659

Benedict Wong   authored and   android-build-merger   commited 2019-04-22 11:18:52 -07:00
886fff3866
Merge "Restrict access to dangerous methods to <= P" into qt-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2019-04-22 07:14:10 +00:00
1e9660ec0a
Add configurability of LinkProperties, meteredness for Test Networks
This commit adds the ability to pass in LinkProperties and meteredness
for additional testing use cases.

Bug: ?
Test: Compiles. Test utility only.
Change-Id: Idf6c3bcae2dea5e61c0418b72b889496919be8ba

Benedict Wong   commited 2019-04-19 10:46:56 -07:00
b6ebb67782
Move NattKeepalivePacketData out of the framework
For implementing parcelable interface for NattKeepalivePacketData.
Move this class out of framework.jar and move to services.jar

This class is used in telephony-common.jar and it also loads
service.jar.

Bug: 33530442
Test: - build pass
      - atest NetworkStackTests
      - atest ConnectivityServiceTest

Change-Id: Id2fdec5c4015d2cefd8a93e0cfdcc3c304fc9b64

Aaron Huang   commited 2019-04-20 00:37:19 +08:00
41014aa609
Fix DnsResolver API could not bypass private DNS correctly
Bug: 130594022
Test: atest DnsResolverTest

Merged-In: Ic9e078f8acf7688850dfe31f15ed065739ad5281
(cherry picked from commit 973f5707bc)

Change-Id: I1788157c784b0ec124bd7d78ba90278b5501d0d4

Luke Huang   commited 2019-04-16 12:41:02 +00:00
c6016895c7
Merge "Fix DnsResolver API could not bypass private DNS correctly" am: 2a443c804f
am: f114a31fd9

Change-Id: Ib2f8ae73e2a9d76d87243d53cac1157032156082

Luke Huang   authored and   android-build-merger   commited 2019-04-16 02:27:28 -07:00
f3291b79de
Merge "Fix DnsResolver API could not bypass private DNS correctly"
Luke Huang   authored and   Gerrit Code Review   commited 2019-04-16 09:03:22 +00:00
2a443c804f
Restrict access to dangerous methods to <= P
Test: make
Fixes: 130143562
Change-Id: I1a6a472f83cf00a1ab174a9c5e67d3e9357a0c45
Merged-In: I95107f7b628eecb54e9f4411785186b668e9f3d8
Merged-In: I890030580fdad45c3f8589bf6adbe5798d578cfe
(cherry picked from commit aa91c9de56)

Chalard Jean   commited 2019-04-16 06:13:09 +00:00
5070e31499
Merge "Restrict access to dangerous methods to <= P" am: 722e228453
am: 1b53b5a755

Change-Id: I95107f7b628eecb54e9f4411785186b668e9f3d8

Chalard Jean   authored and   android-build-merger   commited 2019-04-15 22:39:08 -07:00
01b3ffb147
Merge "Restrict access to dangerous methods to <= P"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-04-16 05:17:20 +00:00
722e228453
Fix DnsResolver API could not bypass private DNS correctly
Bug: 130594022
Test: atest DnsResolverTest
Change-Id: Ibf3edac3075d921d189237c485871efb869b320b

Luke Huang   commited 2019-04-16 11:57:45 +08:00
f4cefaea66
Merge changes I4f181789,Ia8a0c99b am: f7d42a0a3c
am: 7e04c116a3

Change-Id: Ib59e211d4329f885108de9ea0a74669ffb144e17

Lorenzo Colitti   authored and   android-build-merger   commited 2019-04-12 06:37:28 -07:00
4a84f8cb71
Merge "Revert "Block incoming non-VPN packets to apps under fully-routed VPN"" am: 01bfd9e510
am: f7fe1ac9c4

Change-Id: I3e1c408fcfc14db8b2586a79416233ffe9e1173d

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-04-12 06:24:30 -07:00
f2654ce048
Merge "API council feedbacks for DnsResolver" am: 65dc1155ff
am: dca57c2e44

Change-Id: Id731f73f25f437df94f936e9a3ec227b797b6031

Luke Huang   authored and   android-build-merger   commited 2019-04-12 05:31:10 -07:00
b2acaecb20
Revert "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""
This reverts commit 2b6cd177ba.

Reason for revert: Rolling forward, will fix tests in same CL stack.

Bug: 114231106
Bug: 130397860
Test: FrameworksNetTests
Change-Id: Ia8a0c99b4e1fd5dff26c881715cd876618ca4321

Lorenzo Colitti   commited 2019-04-12 19:52:32 +09:00
ee6a630257
Merge "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-04-12 10:25:46 +00:00
01bfd9e510
Revert "Block incoming non-VPN packets to apps under fully-routed VPN"
This reverts commit 1c19cf383f.
This change does not have any topic: not reverting the other 2 commits in the original topic.

Reason for revert: broke FrameworksNetTests presubmit: b/130397860

Change-Id: Iff41d9fe97fafea44680c8d67d1ce19277548cc0

Remi NGUYEN VAN   commited 2019-04-12 09:05:40 +00:00
2b6cd177ba
API council feedbacks for DnsResolver
To address the API review feedback provided by
the API council.

Bug: 129261432
Test: atest DnsResolverTest

Merged-In: I5737cf293264bf9d492e7bd56b62bee4d49002eb
(cherry picked from commit dca57c2e44)

Change-Id: I429dd93285f50314e9d757f4ec8539a3ba40e61b

Luke Huang   commited 2019-04-12 06:23:01 +00:00
965ddfdc5d
Merge changes I98573a5c,Ic7394f24 into qt-dev
* changes:
  Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService
  Cleanup of Test Network service

TreeHugger Robot   authored and   Android (Google) Code Review   commited 2019-04-12 00:54:45 +00:00
3b5424047c
Merge "API council feedbacks for DnsResolver"
Luke Huang   authored and   Gerrit Code Review   commited 2019-04-12 00:45:18 +00:00
65dc1155ff