Commit graph android_packages_modules_Co.../framework
Message SHA1
Merge "Assign the bit calculation as long to prevent overflow" am: d125112aa2 am: 7f5c1bc46c am: 67bdf0e830
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664307

Change-Id: Ia3a1974227ebfd0069b288203df3551a561556eb

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-04-07 06:06:50 +00:00
ec27c044d3
Merge "Assign the bit calculation as long to prevent overflow"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-04-07 04:24:46 +00:00
d125112aa2
Merge "ConnectivityManager: Address review comments from aosp/1595396" am: 7fe967c611 am: 938579f701 am: dfe1a80db6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633279

Change-Id: I05777492db3ab9d7b4c6c69131f9404780e4e832

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-04-07 02:47:49 +00:00
4755f52830
Assign the bit calculation as long to prevent overflow
The value should be assigned as a long to do the bit calculation
as the mNetworkCapabilities is intended to be a long. Otherwise,
the value will be temporary assigned into an integer then
assigned to the target long. When the bit shift calculation
is out of the integer scope, the calculation will overflow and
result in unexpected bebavior.

Without assigning to a long, ConnectivityServiceTest will get
Out-Of-Memory in StringBuilder while generating toString() in
NetworkCapabilities after updating tests to verify
NET_CAPABILITY_VSIM and NET_CAPABILITY_BIP.

Bug: 130869457
Test: atest FrameworksNetTests
Change-Id: I4d34c1215c7efb6dc352c314107792e3fa512ad7

Chiachang Wang   commited 2021-04-07 02:06:33 +00:00
7dd2a3d7db
Merge "ConnectivityManager: Address review comments from aosp/1595396"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-04-07 00:36:27 +00:00
7fe967c611
Merge "NetworkCapabilities: Hide copy constructor" am: 516de2b183 am: 5a76723653 am: 2435d5a787
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664151

Change-Id: Ia04c6e313a5c960c4874cd57cf91c6619d1505da

Roshan Pius   authored and   Automerger Merge Worker   commited 2021-04-06 18:25:52 +00:00
8429766378
ConnectivityManager: Address review comments from aosp/1595396
Bug: 156867433
Test: atest android.net
Test: atest com.android.server
Change-Id: I7f5d043732ae22edd14bf581b7dc676c9236b545

Roshan Pius   commited 2021-04-06 16:42:51 +00:00
f75ffaaded
Merge "NetworkCapabilities: Hide copy constructor"
Roshan Pius   authored and   Gerrit Code Review   commited 2021-04-06 15:57:47 +00:00
516de2b183
Merge "Downgrade DNS fail message from Error to Warning" am: 46b0f02e22 am: bd83b9f1d6 am: d3f719156d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662360

Change-Id: Id5a17d24b9f7bd012df60b4cf1b1d088a34805bc

Ken Chen   authored and   Automerger Merge Worker   commited 2021-04-06 07:56:55 +00:00
13598d6591
Merge "Cleanup setGlobalProxy" am: 0656c4314c am: 42fbe21e61 am: 53f5943e4e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148

Change-Id: Ic9757060f398aaf871141dc5199bf49988637937

Chalard Jean   authored and   Automerger Merge Worker   commited 2021-04-06 07:55:54 +00:00
50da27813b
Merge "Add session ID to VpnTransportInfo"
Frank Li   authored and   Gerrit Code Review   commited 2021-04-06 06:50:48 +00:00
133733bdd2
Merge "Downgrade DNS fail message from Error to Warning"
Ken Chen   authored and   Gerrit Code Review   commited 2021-04-06 06:35:04 +00:00
46b0f02e22
Merge "Cleanup setGlobalProxy"
Chalard Jean   authored and   Gerrit Code Review   commited 2021-04-06 06:19:01 +00:00
0656c4314c
Downgrade DNS fail message from Error to Warning
Most DNS fails are caused by network issues, like connection timed out.
Lower log severity from error to warning to conform to go/greenlog.

Test: 1. connect to a WiFi AP without WAN
      2. atest CtsNetTestCases:android.net.cts.DnsResolverTest
      3. adb logcat | grep resNetworkResult:android
Bug: 181269159
Change-Id: Ifeaf250c91a4b9123d200bd62f085c11009f2491

Ken Chen   commited 2021-04-06 02:30:56 +00:00
5d1c4661da
Merge "Add visibility of framework-connectivity.impl for wifi test" into sc-dev
Chiachang Wang   authored and   Android (Google) Code Review   commited 2021-04-06 00:23:37 +00:00
9be3432c2e
Merge "Remove unstable IpPrefix" am: 3f6415a2f5 am: 2babf25cf0 am: 75968dae24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662674

Change-Id: Idfa92d12a45385412c2013637c657acfb9fec3a2

Steven Moreland   authored and   Automerger Merge Worker   commited 2021-04-06 00:05:48 +00:00
eed29df970
Merge "Remove unstable IpPrefix"
Steven Moreland   authored and   Gerrit Code Review   commited 2021-04-05 21:59:47 +00:00
3f6415a2f5
NetworkCapabilities: Hide copy constructor
Only used by connectivity service, no need to mark it public.

Bug: 184537591
Test: Compiles
Change-Id: Ie0d515d73e30a4e15141a3d92aa739192badeb13

Roshan Pius   commited 2021-04-05 09:29:30 -07:00
f458be1093
Merge "Reduce framework-connectivity footprint" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-04-05 02:15:32 +00:00
7e09bc5b24
Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi" am: 87e0ab8905 am: d5af88a835 am: 01001e2ddf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652974

Change-Id: I7a85feb9753ae91ff3d67dc82c8bc880a6626074

Benedict Wong   authored and   Automerger Merge Worker   commited 2021-04-03 02:01:25 +00:00
54c906b000
Merge "Downgrade list of subIds in NetworkCapabilities to @SystemApi"
Benedict Wong   authored and   Gerrit Code Review   commited 2021-04-02 22:33:20 +00:00
87e0ab8905
Merge "API to get network visible network capability name"
Sarah Chin   authored and   Gerrit Code Review   commited 2021-04-02 16:50:10 +00:00
129857619f
Cleanup setGlobalProxy
This is a small cleanup of a function called by DevicePolicyManager
coming from a conflicting change. This no longer makes a concrete
difference but is still a good change.

Test: m services.devicepolicy
Bug: 172183305
Change-Id: I7ee907314ddb253eb4e97d177f0ea0ab3b58cf03

Chalard Jean   commited 2021-04-02 20:37:21 +09:00
aac3b872ea
Reduce framework-connectivity footprint
Cleanup framework-connectivity to reduce its memory and storage usage:
 - Build libframework-connectivity-jni using standard C and removing
   dependencies on libc++. This saves about 100kB of storage (40+60kB
   on the 32+64 bit variants).
 - Remove dependency on protobuffer libraries, as their usage has been
   removed. This saves about 15kB of storage.

From local measurements, the reduced code size also improves memory
usage.

This also removes a jarjar workaround for net-utils-device-common, as
the library is no longer used either.

Bug: 184111895
Test: device boots, connectivity working
Change-Id: Ibfbd0fe1098293812ae24812621752a7a44f9130

Remi NGUYEN VAN   commited 2021-04-02 10:18:00 +00:00
560da938dd
Downgrade list of subIds in NetworkCapabilities to @SystemApi
This change downgrades API visibility for the list-of-subIds in the
NetworkCapabilities to SystemApi

Bug: 175662146
Test: atest NetworkCapabilitiesTest#testSubIds
Test: atest FrameworksNetTests
Change-Id: I372fa9eaa7585aefd1710948ca007456feedd578

Benedict Wong   commited 2021-04-02 01:18:11 -07:00
4310e45eff
Remove unstable IpPrefix
Seems nothing is using this.

Bug: 183654927
Test: N/A
Change-Id: I94233d79fb5d93970b38a79a09fc4d50822c3620

Steven Moreland   commited 2021-04-01 22:59:02 +00:00
0fb772f6df
Merge "Expose BIP and VSIM relavent definitions"
Aaron Huang   authored and   Gerrit Code Review   commited 2021-04-01 11:38:17 +00:00
55a22edbab
Merge "Move deduceRestrictedCapability to libs/net and rename it"
Aaron Huang   authored and   Gerrit Code Review   commited 2021-04-01 11:37:51 +00:00
e36b232c4a
Merge changes Ib5cd2c27,I4448a354 into sc-dev
* changes:
  [NS10] Fix a bug where registerIgnoringScore is broken
  [NS09] Implement the new ranking code

Chalard Jean   authored and   Android (Google) Code Review   commited 2021-04-01 09:02:15 +00:00
86b272d81d
Add session ID to VpnTransportInfo
- This will be visible only to apps with the NETWORK_SETTINGS
  permissions (signature), and will be redacted for all other callers.
- This string is expected to be the same as set by
  VpnService#setSession, and in general, VpnConfig.session. But it
  will be a general API that Vpn.java can call when setting the
  VpnTransportInfo.
- This string cannot be updated once the VPN NetworkAgent is connected.

Bug: 171872481
Test: atest ConnectivityServiceTest
      atest VpnTransportInfoTest
      atest android.net.cts.NetworkAgentTest
Change-Id: I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d
Merged-In: I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d
           (cherry-picked from ag/14011912)

lifr   commited 2021-04-01 15:46:31 +08:00
375d1f5904
Merge "Expose sendNetworkScore that takes a NetworkScore" into sc-dev
Chalard Jean   authored and   Android (Google) Code Review   commited 2021-04-01 07:17:48 +00:00
8a30bb6048
Merge "Add framework-connectivity-test-defaults" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-04-01 02:43:26 +00:00
52f85bd486
Expose sendNetworkScore that takes a NetworkScore
Bug: 167544279
Test: FrameworksNetTests
CTS-Coverage-Bug: 184037351
Change-Id: I5dd9b526c53cb99a5e4ae87f1e3724a7a1870e78

Chalard Jean   commited 2021-03-31 13:26:46 +00:00
b82a74b077
[NS09] Implement the new ranking code
At this stage, this is turned off. Unit tests will be
in a followup change.

Test: In a followup
Bug: 167544279
Change-Id: I4448a3546fbc1a3dddf757982c031c5f39ba2889

Chalard Jean   commited 2021-03-31 20:59:47 +09:00
b887f60347
Merge changes Id7ee1bd3,I5ea44a94 into sc-dev
* changes:
  [NS08] Expose public NetworkScore API
  [NS07] Add the rest of the scoring policy

Chalard Jean   authored and   Android (Google) Code Review   commited 2021-03-31 11:42:19 +00:00
d7a91befe1
Add visibility of framework-connectivity.impl for wifi test
Add visibility to allow FrameworksWifiTests to access hidden
connectivity APIs.

Bug: 171540887
Test: m FrameworksWifiTests
Change-Id: I3cd377d7045e7e161d0813aa2d614dff1b5a311b

Chiachang Wang   commited 2021-03-31 09:33:21 +00:00
f4f52e185c
Add framework-connectivity-test-defaults
The defaults follow the same pattern as framework-wifi-test-defaults to
allow unit tests to build against hidden API in Connectivity.

Bug: 171540887
Test: m
Change-Id: I58bb6574f7e95053e4a95f76d1025506749ec2b8

Remi NGUYEN VAN   authored and   Chiachang Wang   commited 2021-03-31 17:19:57 +08:00
db6feeab42
[NS08] Expose public NetworkScore API
This exposes the two bits settable by the network agents in
Android S on NetworkScore. This is meant to be extensible in
future releases, or possibly for OEM upstreams.

Test: builds
CTS-Coverage-Bug: 184037351
Bug: 167544279
Change-Id: Id7ee1bd3e2679f0bd5200d5c299f18a33b87847c

Chalard Jean   commited 2021-03-30 23:54:19 +09:00
c44fa15b73
[NS07] Add the rest of the scoring policy
Bug: 167544279
Test: FrameworksNetTests
Change-Id: I5ea44a94ac6f16486274e9091f15a84734db2341

Chalard Jean   commited 2021-03-30 23:50:41 +09:00
7851544cb5
Merge "Add new network capabilities to support automotive head unit via USB" into sc-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2021-03-30 14:36:56 +00:00
a610eede44
Merge "[JS01]Remove hidden API usage of Connectivity Sevice"
Frank Li   authored and   Gerrit Code Review   commited 2021-03-30 07:22:40 +00:00
0557b8b4c6
[JS01]Remove hidden API usage of Connectivity Sevice
The Connectivity service will become the mainline module.
Therefore, remove the caller of using Connectivity's
hidden API outside the module and expose the required
connectivity API used in Jobscheduler.

Bug: 183456204
CTS-Coverage-Bug: 170598012
Test: atest JobStoreTest
Change-Id: Ie6bc81ff382fb242b98f35d28a96defc207c7987
Merged-In: Ie6bc81ff382fb242b98f35d28a96defc207c7987
           (cherry-picked from ag/13946348)

lifr   commited 2021-03-30 11:41:50 +08:00
d023f35cc3
Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: 2206e976c1 am: 8c9d2c1823 am: 958a701738
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262

Change-Id: I94e5cf19a7b7dac8400cb7acf80b39a864099956

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-03-30 02:24:00 +00:00
61a9bf9f02
Merge "Add session ID to VpnTransportInfo" into sc-dev
Lorenzo Colitti   authored and   Android (Google) Code Review   commited 2021-03-30 00:39:38 +00:00
624a47fc57
Add a setTeardownDelayMs API to NetworkAgent.
This allows transports to request that when the network is
disconnected, the system should delay destroying the native
network until the specified time has passed after the network
disconnected.

Bug: 181941583
Test: next CL in the stack
Change-Id: I9765f1c9d1e55c23c6d583d6709dbe06505975b1

Lorenzo Colitti   commited 2021-03-29 21:33:08 +09:00
6d88078151
Address comments on onBlockedStatusChanged(Network, int) CL.
Test: m
Bug: 165835257
Change-Id: I6d3007a1eac54ee6650b350aee56ed398a2c950d

Lorenzo Colitti   commited 2021-03-29 20:12:09 +09:00
a37eaff1ea
Add new network capabilities to support automotive head unit via USB
- Add a new transport type for USB and a new network capability
to support automotive head unit.
- In order to pass DnsManagerTest#testTransportTypesEqual, Android.bp
needs to link to dnsresolver_aidl_interface-V8-java. That test checks
whether the TRANSPORT types defined in NetworkCapabilities are the
same as IDnsResolver.aidl.

Bug: 181742019
Test: atest FrameworksNetTests
Change-Id: Iec2df09a776d779108f95098e01b7ffdf6f8867a

lucaslin   authored and   Lucas Lin   commited 2021-03-29 10:59:06 +00:00
e545c385a8
[TL02]Remove hidden API usage of NetworkAgent
The connection service will become the mainline module.
Remove the hidden API usage of NetworkAgent.

Bug: 170598012
CTS-Coverage-Bug: 170598012
Test: atest FrameworksNetTests FrameworksTelephonyTests
      atest FrameworksWifiTests
Change-Id: I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c
Merged-In: I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c

lifr   commited 2021-03-29 15:33:44 +08:00
f1594291c4
Merge "Re-implement NetworkUtils#queryUserAccess."
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-03-29 04:57:40 +00:00
a99e50dbf7
Re-implement NetworkUtils#queryUserAccess.
Currently, queryUserAccess talks to netd via FwmarkServer.
Doing this from the module would require exposing queryUserAccess
as an NDK API or reimplementing FwmarkClient.

Because queryUserAccess really only uses information that comes
from ConnectivityService/PermissionMonitor anyway, just use that
information without calling to net.

Test: atest HostsideVpnTests
Bug: 171540887
Merged-In: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc

Change-Id: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc

Lorenzo Colitti   authored and   Remi NGUYEN VAN   commited 2021-03-29 12:11:19 +09:00
092af05525