Commit graph android_packages_modules_Co.../core/java/android
Message SHA1
Merge "Reinstate access to a forgotten member" into qt-dev
Chalard Jean   authored and   Android (Google) Code Review   commited 2019-05-28 09:38:51 +00:00
e97ef6d1d9
Merge changes from topic "am-851f19c8d7d34bb48accd48868aae501-qt-dev" into qt-dev
* changes:
  Remove broken test testRfc6724Sort
  Add Rfc6724 style sort for DnsResolver and fix potential bug

Luke Huang   authored and   Android (Google) Code Review   commited 2019-05-28 05:38:49 +00:00
d8bc2b5a15
Reinstate access to a forgotten member
Followup to aosp/964440

Bug: 131764329
Test: none
Merged-In: I6f6b2cf75793532d3d537a223b8e15d7304a1e3f
Change-Id: Ib279c0076016c53e0491fc0df8cefff8ae280d66
(cherry picked from commit 41bd3c57b4ba347ac6eb4546855daf5473264a29)

Chalard Jean   commited 2019-05-27 12:21:15 +00:00
ddfa1f5f4d
[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
Merged-In: Ib3fde31d88c36469cdee1e3578606d130a9817cb
Change-Id: Ib3fde31d88c36469cdee1e3578606d130a9817cb
(cherry picked from commit 51ddc176abd23bd3ddbc26124e5541a983a1db07)

Etan Cohen   commited 2019-05-23 16:20:15 +00:00
0da57a8b67
Add Rfc6724 style sort for DnsResolver and fix potential bug
1. pass default network explicitly to fix potential
   mis-sync network problem in DnsResolver#query
2. Add rfc6724 sort and related test
3. DnsResolver do rfc6724 sort before response InetAddress answers
4. move haveIpv* function from DnsResolver to DnsUtils

Bug: 129530368
Test: atest DnsResolverTest DnsUtilsTest

Merged-In: I0323f5c7f32fc3fa589b9e87f8e7c9caf744dbd4
(cherry picked from commit d352f4ca85ff8418a5a58d32fb03b85d7e0b843b)

Change-Id: I98455045fa43cc5a5902a08232251c1734feaac3

Luke Huang   commited 2019-05-23 14:36:21 +00:00
51b9f6c069
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
b95ade4679
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
8ad1afb8f8
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
6f1f2df72b
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
ec4eb8f448
[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
2f9a465841
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
65caa406e7
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
8cf997d1c1
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 65968ea16bf49f678d4a43c220e1d67393170459)

Rubin Xu   commited 2019-04-24 11:56:46 +01:00
dc587d75e1
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
3f6b2004ce
Fix DnsResolver API could not bypass private DNS correctly
Bug: 130594022
Test: atest DnsResolverTest

Merged-In: Ic9e078f8acf7688850dfe31f15ed065739ad5281
(cherry picked from commit c21eb1fb31dff7b05aabbbc2f45caf587095abc3)

Change-Id: I1788157c784b0ec124bd7d78ba90278b5501d0d4

Luke Huang   commited 2019-04-16 12:41:02 +00:00
830600090c
Restrict access to dangerous methods to <= P
Test: make
Fixes: 130143562
Change-Id: I1a6a472f83cf00a1ab174a9c5e67d3e9357a0c45
Merged-In: I95107f7b628eecb54e9f4411785186b668e9f3d8
Merged-In: I890030580fdad45c3f8589bf6adbe5798d578cfe
(cherry picked from commit 0bb53dbb64bbc937a23e1dc7641c8988a6d11d64)

Chalard Jean   commited 2019-04-16 06:13:09 +00:00
6fb1669b65
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 454fe010dcacd38211b857d2b235ed37269e3b7e)

Change-Id: I429dd93285f50314e9d757f4ec8539a3ba40e61b

Luke Huang   commited 2019-04-12 06:23:01 +00:00
0494f8833d
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
0301854863
Cleanup of Test Network service
This follow-up change performs some cleanup changes without affecting
functionality

Bug: 72950854
Test: Compiles, CTS tests using this pass
Change-Id: Ic7394f24f11d713c9374b438182e29d2a02ea236
Merged-In: Ic7394f24f11d713c9374b438182e29d2a02ea236
(cherry picked from commit 7df36ed96a807f258aef43e558ef127b27b90756)

Benedict Wong   commited 2019-04-11 20:04:06 +00:00
a66baf749b
Add support for TAP interfaces in TestNetworkManager.
Bug: 72950854
Test: builds, boots
Change-Id: I88bfd7f37c0ba0228f8288fe92212618ce134e4f
Merged-In: I88bfd7f37c0ba0228f8288fe92212618ce134e4f
(cherry picked from commit ba2eb5e0621c4f2a2c86a641998b4ae1953ae4b8)

Lorenzo Colitti   commited 2019-04-11 12:04:23 +00:00
28a9894888
Move attach*Filter() and addArpEntry() methods to NetworkStack
The SocketUtils.attach*Filter and SocketUtils.addArpEntry methods
were added there because they could not be added as JNI inside
the NetworkStack. This was not possible because on Go devices,
the NetworkStack was a jar library. But now, Go also uses an APK.
Hence, move these methods to the NetworkStack.

Fixes: 129433183
Merged-In: I66d7b3e4fbfa32bb0bc853e8cf9399031daff8a9
(cherry picked from commit fe71be2b04a3213828dc0347a1dd4a3675d20562)

Change-Id: Ice433a41469e784385f19498c154345d7b9c69b5

Remi NGUYEN VAN   commited 2019-04-08 01:41:39 +00:00
1da5fac070
Merge "Some cleanups for Tethering" am: 7cf4907b89 am: 997009af45
am: e28dc820e4

Change-Id: I0f5c8f33f13dfa2366992a2b2e0ada7667b90e2f

Mark Chien   authored and   android-build-merger   commited 2019-04-03 03:54:42 -07:00
5ca20d48aa
Merge "Some cleanups for Tethering"
Mark Chien   authored and   Gerrit Code Review   commited 2019-04-03 10:16:25 +00:00
7cf4907b89
Merge "Fix API in CaptivePortal, StaticIpConfiguration" am: cf0f380f4e am: fb943d00ca
am: 69528af3db

Change-Id: Icda65fe4a009a754b6a1a763d402820652d55391

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-04-03 02:28:11 -07:00
99d282d2f6
Merge "Fix API in CaptivePortal, StaticIpConfiguration"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-04-03 06:51:35 +00:00
cf0f380f4e
Some cleanups for Tethering
Bug: 126481523
Test: -build, flash, boot
      -FrameworksNetTests

Change-Id: I904646efa87eb5434124c7828aca4ab09c5dc38e

markchien   commited 2019-04-03 13:56:00 +08:00
42e22097c3
Merge "Address leftover comments on 923337 and 930217." am: a9b8e31cf8 am: bc8ca075ef
am: 6106d1e017

Change-Id: I75eadb66c81d72c768e77feddd383d60f8accd65

Paul Hu   authored and   android-build-merger   commited 2019-04-02 01:29:08 -07:00
6aeeca832f
Merge "Address leftover comments on 923337 and 930217."
Paul Hu   authored and   Gerrit Code Review   commited 2019-04-02 07:39:04 +00:00
a9b8e31cf8
Fix API in CaptivePortal, StaticIpConfiguration
- Add documentation to CaptivePortal#logEvent
 - Add paragraph breaks to StaticIpConfiguration class javadoc
 - Format javadoc for API documentation
 - Move setters to a builder and hide fields for apps targeting P or
   older
 - Document StaticIpConfiguration getters and builder setters
 - Add documentation for StaticIpConfiguration#getRoutes

Bug: 129362244
Bug: 129433304
Test: built, flashed, booted, WiFi working
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: Ia66c1097f01ca87d02eba3456547aedb1e480186

Remi NGUYEN VAN   commited 2019-04-02 10:43:04 +09:00
04c58fe907
Address leftover comments on 923337 and 930217.
- Restrict unprivileged apps to use
  NetworkRequest.Builder#setSignalStrength.

- Remove the "throws NullPointerException" in
  CaptivePortalProbeSpec constructor.

- Remove the null check in LinkProperties.

- Add annotataion into all ConnectivityManager.NetworkCallback
  methods.

Change-Id: Id275cac1d6a30d7515cd7b113394f5e8a0179314
Fix: 129097486
Test: atest FrameworksNetTests

paulhu   commited 2019-04-01 16:24:10 +08:00
1a40765101
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues." am: 1f041d1443 am: 9420c284b5
am: ea2bcdfa4e

Change-Id: I599dcdb2312a3e1bb1de8e03f349df207c7cc075

Paul Hu   authored and   android-build-merger   commited 2019-04-01 00:52:53 -07:00
614b2571b6
Merge "Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues."
Paul Hu   authored and   Gerrit Code Review   commited 2019-04-01 07:20:53 +00:00
1f041d1443
Fix ApfCapabilities, LinkAddress, RouteInfo, IpPrefix API issues.
Fix: 129362082
Fix: 129361362
Fix: 129360330
Fix: 129362379
Test: atest FrameworksNetTests NetworkStackTests
Change-Id: I05fbc6f98207d5cf002e3cbc5829040af7d6be52

paulhu   commited 2019-04-01 10:23:51 +08:00
895a741bf1
Merge "Minor change for async DNS API" am: 80be1b1127 am: e0b323df1b
am: 2f0336caa9

Change-Id: Iebc2946e5705cfda16f44cb468804c2be385c02a

Luke Huang   authored and   android-build-merger   commited 2019-03-29 12:03:25 -07:00
31f19f7af7
Merge "Unremove DnsResolver#query method used by external developers" am: 3dd6df002b am: f674528970
am: 22f7e75f67

Change-Id: Ibfba10cb92e63a7ae727f48543da040aa5f39116

Lorenzo Colitti   authored and   android-build-merger   commited 2019-03-29 08:38:15 -07:00
6180380e75
Minor change for async DNS API
do the minor changes to address comments before

Bug: 129395490
Test: atest DnsResolverTest
Change-Id: I56e2e5bc4352ff5c979579247a333a41950079da

Luke Huang   commited 2019-03-29 18:12:26 +08:00
293ffaa081
Unremove DnsResolver#query method used by external developers
This method was removed as part of addressing API council feedback in b/129261432
Add back previous DnsResolver#query which is already being used by developers.

Bug: 129395490
Test: atest DnsResolverTest

Change-Id: Ic956db204f3940d39d42e1b11dda39e57d356fad

Luke Huang   commited 2019-03-29 18:12:26 +08:00
fb5afabcb8
Merge "Fix cancellation race problem for aysnc DNS API" am: de6217b8e2 am: 829e409827
am: ae338a8030

Change-Id: I4e10bfaa43a63cedd9fbddfc6f8bf8853c426eba

Luke Huang   authored and   android-build-merger   commited 2019-03-28 21:18:41 -07:00
19dcd80972
Fix cancellation race problem for aysnc DNS API
This problem might cause double-close fd and result in app crash
or unexpected behaviour

Bug: 129317069
Test: atest DnsResolverTest
      manual test with delaying response callback/cancel
Change-Id: I223234f527edafc51d34fa6be390419c05def8d8

Luke Huang   commited 2019-03-28 19:46:56 +08:00
e17bb2dff4
Merge changes I0baf582f,I4bba01ba am: 6d7c97dc5c am: a0540419f9
am: 7fd6b91b04

Change-Id: I2cc021899270b41e4b9047ef32869af53ea6fb65

Junyu Lai   authored and   android-build-merger   commited 2019-03-27 18:43:18 -07:00
bf7917290e
Block unpriviledged apps which create keepalives with null fd
Currently, socketKeepalive implementation is accepting null fd
due to backward compatibility with legacy packet keepalive API.
However, due to lack of the fd, the service cannot guarantee the
port is not reused by another app if the caller release the port
for any reason.

Thus, grant the null fd access only for priviledged apps.

This commit also address some comments from aosp/918533.

Bug: 126699232
Test: atest FrameworksNetTests
Change-Id: I0baf582ff4ca8af6082c3754e8dfbcd867f39792

junyulai   commited 2019-03-27 19:51:08 +08:00
828dad188c
Merge "Add nullability annotations" am: 539821c978 am: 97350573b9
am: c66eb1e12e

Change-Id: I43088399da1d81556ab903ef1ca716439129f00d

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-03-25 06:56:43 -07:00
e289064a7b
Merge "Add nullability annotations"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-03-25 13:19:19 +00:00
539821c978
Merge "Fix SocketKeepalive APIs which do not meet API review requirement" am: 66bc22760a am: 7246f1a563
am: 0f69af35db

Change-Id: I873a82de90efce6f3baa17761c0576dc9c8210be

Junyu Lai   authored and   android-build-merger   commited 2019-03-25 04:16:18 -07:00
40ad433f92
Merge "Fix SocketKeepalive APIs which do not meet API review requirement"
Junyu Lai   authored and   Gerrit Code Review   commited 2019-03-25 10:42:37 +00:00
66bc22760a
Fix SocketKeepalive APIs which do not meet API review requirement
Per API review, change the use of FileDescriptor to
ParcelFileDescriptor.
This change also fix nullability according to API review
feedbacks.

Fix: 126698610
Fix: 126699425
Fix: 126699232
Fix: 126700278

Test: 1. m -j
      2. atest FrameworksNetTests --generate-new-metrics 50
      3. m -j doc-comment-check-docs
Change-Id: I19476c50dd1ca290bf3f41973829da2bd229796a

junyulai   commited 2019-03-25 15:56:35 +08:00
7e06ad4ce9
Add nullability annotations
Add nullability annotations on the following methods:
 - StaticIpConfiguration#getRoutes
 - ValidationProbeEvent#getProbeName

Test: m
Bug: 128935825
Change-Id: I1c17d200f3125e684c4e4d67b2f7f079eda310b6

Remi NGUYEN VAN   commited 2019-03-25 16:46:34 +09:00
be381ab943
Merge "Separate NetworkMonitor/framework portal URL" am: 8ab472e77a am: afa7a43b17
am: 0fabd5dca2

Change-Id: I85e744d94d96ecf9ac558e62016418d8199bb98c

Remi NGUYEN VAN   authored and   android-build-merger   commited 2019-03-24 20:23:39 -07:00
fa062e4857
Merge "Separate NetworkMonitor/framework portal URL"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-03-25 02:50:37 +00:00
8ab472e77a
Merge "Fix API in CaptivePortal and ConnectivityManager"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-03-25 02:37:28 +00:00
8f4c739827