Commit graph android_packages_modules_Co.../core/java/android
Message SHA1
Get resource based on subId for multi-SIM
The resource loading is done based on the last SIM to come up
which is not a deterministic design. Thus, update the way to get
the resource based on the subId.

Test: atest FrameworksNetTests
Test: manually test with avoid bad wifi feature supported sim
Bug: 138956509
Change-Id: Ib5b085d97103889600773d269e03b939c29ca47d

Chiachang Wang   commited 2019-08-14 13:56:37 +08:00
5fed8d9ee3
Revert "Cherry-pick the relevant parts of master change"
This reverts commit 5a4844e307.

Reason for revert: multiple build breakages b/137069068

Change-Id: If48bfa2d2cab0877a053743b3ec53820d0c4ed6b

Fedor Kudasov   authored and   Chalard Jean   commited 2019-07-09 09:29:17 +00:00
2559cb3953
Revert "Remove providesRoutesToMostDestinations."
This reverts commit 92bd90fa0b.

Reason for revert: multiple build breakages b/137069068

Change-Id: I60a4f71e13fe82f970b177a07c0b58439cbc64ff

Fedor Kudasov   commited 2019-07-09 09:23:25 +00:00
496a313f47
Remove providesRoutesToMostDestinations.
This function is not used any more.

Test: FrameworksNetTests
Change-Id: Ia43f8811cb9d575e16735b0f4b76d91e7cd42ebc

Chalard Jean   commited 2019-07-08 20:36:33 +09:00
92bd90fa0b
Cherry-pick the relevant parts of master change
I566437e4fe10e1346858149120c50b3c20ca073f to avoid a conflict

Test: atest FrameworksNetTests
Change-Id: I7de4f67234bf97d58bddffa22272c7670398f56d

Chalard Jean   commited 2019-07-08 20:25:45 +09:00
5a4844e307
Unit tests for new explicitlySelected behaviour.
ag/7905088 added the ability to pass in acceptUnvalidated without
passing in explicitlySelected. Add unit tests for that code.

While I'm at it, convert a couple of "== 1"s to toBool(), and
update the comments in NetworkAgent.

Bug: 130766237
Test: atest FrameworksNetTests
Change-Id: I6b550bd621e3596975f83464c7b4b8a14269120b

Lorenzo Colitti   commited 2019-06-28 23:57:22 +09:00
f255e047b7
Merge "Move the test of minimum supported keepalive slots to CTS"
Junyu Lai   authored and   Gerrit Code Review   commited 2019-06-19 14:08:31 +00:00
c961e03526
Merge "Correct value of supported keepalive count for cellular"
Junyu Lai   authored and   Gerrit Code Review   commited 2019-06-19 14:08:31 +00:00
7423873ac8
Move the test of minimum supported keepalive slots to CTS
This change also enables log when keepalive is started.

Bug: 134352656
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest FrameworksNetTests
Change-Id: I408750fa0bceb0c1c26afb5fead4e44fb824fbc1

junyulai   commited 2019-06-19 16:25:19 +08:00
5b3b486b8f
Remove the <= P restriction for WIFI_P2P
This is still sent in an intent.

Bug: 975059
Change-Id: I56c86b0c1912064d5a642991df32d2cefb6a8d5b

Chalard Jean   commited 2019-06-17 19:46:34 +09:00
a070aaa88f
Correct value of supported keepalive count for cellular
Cellular only supports 1 keepalive connection so correct the default
supported value to 1.

Bug: 134037217
Test: - atest FrameworksNetTests
      - atest android.net.cts.ConnectivityManagerTest \
        #testSocketKeepaliveLimitTelephony

Change-Id: Ia3761f2e78d54866bb2e156d58004396bbc8adc3

Aaron Huang   commited 2019-06-11 22:04:34 +08:00
ede0d5075b
Fix race condition caused by fd reused for DnsResolver
There might be a gap between fd close and fd event listener unregister.
If fd is reused for another query during that gap, it might cause the
query failed with no response since addOnFileDescriptorEventListener
method failed. To fix this problem, we must ensure that fd event
listener is unregistered before fd closing.

Bug: 134310704
Test: atest DnsResolverTest
Change-Id: Ifb6bd34dc54dcf1c61fe8b87785124df4bc0f410

Luke Huang   commited 2019-06-11 15:18:28 +08:00
6c8b770a98
Merge "Allow passing in acceptUnvalidated without explicitlySelected"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2019-06-05 05:00:14 +00:00
c8b4342998
Allow passing in acceptUnvalidated without explicitlySelected
This will allow wifi to tell ConnectivityService that partial
connectivity is acceptable even if the network is not explicitly
selected.

This is needed when the user selects a partial connectivity
network and tells the system to connect to the network, and never
to ask again. In such cases, the system must switch to the
network even if it is not explicitly selected.

Bug: 130766237
Test: atest FrameworksNetTests
Test: unit tests in an upcoming CL
Change-Id: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
Merged-In: I13465090b7b1c0bf5dc83362387a5428d77b7e1d
(cherry picked from commit e01696a4c4)

Lorenzo Colitti   commited 2019-06-05 11:12:18 +09:00
b882c54945
Fix cannot create Nat-T keepalive on mobile data
Currently phone process fail to unparcel NattKeepalivePacketData
since it is not in framework. Moves NattKeepalivePacketData to
framework to make it can be utilized by telephony.

This change also removes the error feedback triggered by calling
add keepalive packet filter to an unsupported network agent. This
is misinterpreted by KeepaliveTracker that start keepalive is
failing.

Bug: 134048171
Test: 1. atest android.net.cts.ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
      2. atest android.net.cts.ConnectivityManagerTest
      3. atest FrameworksNetTests
      4. atest FrameworksTelephonyTests
Change-Id: If630d5b339aa722717258c721daa8ead8c431e2d

junyulai   commited 2019-06-04 18:22:15 +08:00
88da121dfe
Fix issue for DnsResolver#query
1. Previously, getDnsNetId doesn't handle all the cases.
Fix it with cosidering bypass private DNS flag.
2. Make getDnsNetId return Network instead of netId,
and change name from getDnsNetId to getDnsNetwork

Bug: 129530368
Test: atest DnsResolverTest DnsUtilsTest
Change-Id: Ic8d45b802d72a266f9ec97bfea620c1ede6967e5

Luke Huang   commited 2019-05-30 06:34:03 +00:00
be164b2db8
Minor changes for DnsUtils and its test
fix nits for ag/7671031

Bug: 129530368
Test: atest DnsUtilsTest
Change-Id: I562d33870a933a5fe55c89137a2d9574e3c59b90

Luke Huang   commited 2019-05-29 13:56:27 +08:00
3b14d4641a
Merge "Reinstate access to a forgotten member"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-05-27 11:14:37 +00:00
c73af87b45
Reinstate access to a forgotten member
Followup to aosp/964440

Bug: 131764329
Test: none
Change-Id: I6f6b2cf75793532d3d537a223b8e15d7304a1e3f

Chalard Jean   commited 2019-05-23 03:32:30 +00:00
8759c1ec9e
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
Change-Id: I4efa599c0605f6a9e4ef2dd1a36572c69b3c433f

Luke Huang   commited 2019-05-23 11:23:41 +08:00
26c1cdb19d
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
43c1536c6b
Merge "Update throws documentation for requestNetwork*"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-05-22 08:34:43 +00:00
bfcbf4b450
Merge "Let clients access StaticIpConfiguration members through reflection."
Chalard Jean   authored and   Gerrit Code Review   commited 2019-05-22 07:17:52 +00:00
65663acf34
[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
b58e366f2d
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
654be392b6
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
b4368bed5a
Update throws documentation for requestNetwork*
Bug: 78126688
Test: builds
Change-Id: I8b5bb052bf73feed0dfafafaf44fcd07f58186ce

Chalard Jean   commited 2019-05-14 22:16:29 +09:00
31740e4ed3
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
6a5c545890
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
4dca18aa31
[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
6cb6599ddd
Merge "Move NattKeepalivePacketData out of the framework"
Aaron Huang   authored and   Gerrit Code Review   commited 2019-04-24 04:00:56 +00:00
d3ee38785b
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
6259ad2be9
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
f7adc47367
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
9c138c7a13
Merge "Restrict access to dangerous methods to <= P"
Chalard Jean   authored and   Gerrit Code Review   commited 2019-04-16 05:17:20 +00:00
861e9b56bd
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
4c349d2ed2
Revert "Revert "Block incoming non-VPN packets to apps under fully-routed VPN""
This reverts commit bc571c7cc8.

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
bad9d911b8
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
27a60a1aff
Revert "Block incoming non-VPN packets to apps under fully-routed VPN"
This reverts commit 4773027064.
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
bc571c7cc8
Merge "API council feedbacks for DnsResolver"
Luke Huang   authored and   Gerrit Code Review   commited 2019-04-12 00:45:18 +00:00
3436bc64ca
Merge "Block incoming non-VPN packets to apps under fully-routed VPN"
Rubin Xu   authored and   Gerrit Code Review   commited 2019-04-11 16:46:16 +00:00
fd20f8da0a
API council feedbacks for DnsResolver
To address the API review feedback provided by
the API council.

Bug: 129261432
Test: atest DnsResolverTest
Change-Id: I3de11c913682abf790850b45cd5d50ac28b3fc5c

Luke Huang   commited 2019-04-11 22:17:20 +08:00
81cec00c55
Merge "Add support for TAP interfaces in TestNetworkManager."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2019-04-11 11:45:40 +00:00
144e714d79
Merge changes I98573a5c,Ic7394f24
* changes:
  Enable checks for MANAGE_TEST_NETWORKS in TestNetworkService
  Cleanup of Test Network service

Benedict Wong   authored and   Gerrit Code Review   commited 2019-04-10 17:06:17 +00:00
0855a3c457
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
Change-Id: I143b03d60e46cb1b04732b4a4034f5847b4d1b1a

Rubin Xu   commited 2019-04-10 17:05:54 +01:00
4773027064
Merge "Fix comment on StaticIpConfiguration#getDomains"
Treehugger Robot   authored and   Gerrit Code Review   commited 2019-04-10 06:30:55 +00:00
4aca98b5f5
Add support for TAP interfaces in TestNetworkManager.
Test: builds, boots
Change-Id: I88bfd7f37c0ba0228f8288fe92212618ce134e4f

Lorenzo Colitti   commited 2019-04-10 13:29:41 +09:00
93fac2892e
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

Benedict Wong   commited 2019-04-09 16:34:35 -07:00
8856354a8a
Restrict access to dangerous methods to <= P
Test: make
Fixes: 130143562
Change-Id: I1a6a472f83cf00a1ab174a9c5e67d3e9357a0c45

Chalard Jean   commited 2019-04-09 15:47:25 +09:00
a3b77516bc
Merge "Move attach*Filter() and addArpEntry() methods to NetworkStack"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2019-04-05 06:38:08 +00:00
82b74785d7