Commit graph android_packages_modules_Co.../framework
Message SHA1
TransportInfo: Add a generic redaction mechanism
This replaces the existing mechanism for redacting location sensitive
fields with a more extensible mechanism. Currently supported redactions
are for the following permissions:
i. ACCESS_FINE_LOCATION
ii. LOCAL_MAC_ADDRESS
iii. NETWORK_SETTINGS

Also, removed WifiInfo from ConnectivityServiceTest to reduce cross
dependencies on wifi code.

Bug: 156867433
Bug: 162602799
Test: atest android.net
Test: atest com.android.server
Change-Id: I2bb980c624667a55c1383f13ab71b9b97ed6eeab

Roshan Pius   commited 2021-03-19 20:15:21 +00:00
e2d2838805
Merge "Fix InetAddressCompat exception handling" into sc-dev
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2021-03-19 16:14:10 +00:00
a9a0b49bbc
Fix InetAddressCompat exception handling
Fix InetAddressCompat exception handling to throw the original exception
in case of InvocationTargetException, rather than wrapping in a generic
IllegalStateException.

Bug: 183198868
Test: Test device with and without connectivity
Change-Id: Idc4d678afe9f20f920d7061790af4203ab75be26

Remi NGUYEN VAN   commited 2021-03-19 23:56:27 +09:00
257d49c300
Fix InetAddressCompat exception handling
Fix InetAddressCompat exception handling to throw the original exception
in case of InvocationTargetException, rather than wrapping in a generic
IllegalStateException.

Bug: 183198868
Test: Test device with and without connectivity
Change-Id: Idc4d678afe9f20f920d7061790af4203ab75be26

Remi NGUYEN VAN   commited 2021-03-19 14:45:48 +00:00
57707a50da
Merge "Reland: CaptivePortalData: use CharSequence in VenueFriendlyName API" into sc-dev
Chalard Jean   authored and   Android (Google) Code Review   commited 2021-03-19 14:26:06 +00:00
4be4b3eee7
Use jniThrowErrnoException from JNIHelp
Use the jniThrowErrnoException that is available in JNIHelp, instead of
reimplementing in NetworkUtils.

Bug: 179229316
Test: device boots and has connectivity
Change-Id: I257a9d55ce1f5a7c588e209b4a89d3e7a3e09994

Remi NGUYEN VAN   commited 2021-03-19 13:44:11 +00:00
c1f2d31b39
Merge "Move NetworkUtils JNI out of core/jni" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-03-19 13:42:54 +00:00
d5248e068a
Merge "Add startCaptivePortalApp to system API" am: 1756295fc5 am: c5472a3cf7 am: 8020cb4517
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639899

Change-Id: Ia3be29892f62b82d23a165bc8334a083c674aefb

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-03-19 13:09:03 +00:00
abe928e7eb
Merge "[NS03] Mix in other CS-managed properties" am: 80e17b0086 am: e5421446a7 am: 69c741ec42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556101

Change-Id: I20c4d8392dba72b142cd9cdf15bed94d52848b81

Chalard Jean   authored and   Automerger Merge Worker   commited 2021-03-19 11:32:34 +00:00
4a22d06d85
Merge "Expose getCapabilities" am: ca98471c77 am: f21c73b7ad am: 00a76b180b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641919

Change-Id: I9a6b6f405ee4b7d5d03173d6c5e22e1018dc3417

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-19 11:32:07 +00:00
7ead06e186
Merge "Add startCaptivePortalApp to system API"
Chiachang Wang   authored and   Gerrit Code Review   commited 2021-03-19 11:30:20 +00:00
1756295fc5
Move NetworkUtils JNI out of core/jni
Keep the utilities included via a library, but move them out of
core/jni, and prepare a library to package them together with
framework-connectivity.

Also remove unnecessary dependencies in framework-connectivity.

Bug: 171540887
Test: device boots and has connectivity

Change-Id: I0b55dfe92f3cb6e848d79ac7953756f39aaa2597

Remi NGUYEN VAN   commited 2021-03-19 11:01:17 +00:00
c58c993dda
Merge "Move connectivity AIDLs to android.net" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-03-19 10:51:22 +00:00
db597e7819
Merge "Expose constants of ConnectivityManager" into sc-dev
Chiachang Wang   authored and   Android (Google) Code Review   commited 2021-03-19 10:40:49 +00:00
473b69519b
Merge "[NS03] Mix in other CS-managed properties"
Chalard Jean   authored and   Gerrit Code Review   commited 2021-03-19 10:32:46 +00:00
80e17b0086
Merge changes from topic "replaceUidRange" into sc-dev
* changes:
  Expose uids related APIs in NetworkRequest and NetworkCapabilities
  Replace the usage of UidRange

Chiachang Wang   authored and   Android (Google) Code Review   commited 2021-03-19 10:32:30 +00:00
b98d22d6f5
Merge "Expose getCapabilities"
Lucas Lin   authored and   Gerrit Code Review   commited 2021-03-19 10:24:25 +00:00
ca98471c77
Reland: CaptivePortalData: use CharSequence in VenueFriendlyName API
Following up on feedback from API council, change the String type
to CharSequence in the get and set Venue friendly name API.

Bug: 179163405
Test: atest ConnectivityServiceTest CtsNetTestCasesLatestSdk:CaptivePortalDataTest
Test: atest NetworkNotificationManagerTest NetworkMonitorTest
Change-Id: Ifa3ea9aae0cabf5757791c4ae13e6f551759ed97

Hai Shalom   authored and   Remi NGUYEN VAN   commited 2021-03-19 09:40:34 +00:00
60372ff53d
Merge "Revert "CaptivePortalData: use CharSequence in VenueFriendlyName API"" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-03-19 09:38:35 +00:00
66df804393
Revert "CaptivePortalData: use CharSequence in VenueFriendlyName API"
This reverts commit 6ae29ff41a.

Reason for revert: b/183174863
Bug: 183174863

Change-Id: I4db923e112bba149f4e8eb4cfa8c3f97defd5e63

Remi NGUYEN VAN   commited 2021-03-19 08:10:35 +00:00
d9b56cea16
Move connectivity AIDLs to android.net
java_sdk_libraries and apexes need to contain bootclasspath classes
under predefined packages. Tethering currently uses android.net, so make
sure all the connectivity bootclasspath classes are under android.net.

This avoids maintaining two packages for the tethering APEX, where
com.android.connectivity.aidl is only used by internal AIDL files.

Bug: 182984842
Test: m
Change-Id: I611f1941698c574e37aea912ee76dadc8b32e41a

Remi NGUYEN VAN   commited 2021-03-19 07:44:21 +00:00
60ad218d72
Merge "[NS02] Mix in validation of the score" am: b68825591b am: f6ad9e71b2 am: 37e8ecdb9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556100

Change-Id: I4a622efe89f7d116751d0243ba29441ef76e997a

Chalard Jean   authored and   Automerger Merge Worker   commited 2021-03-19 07:27:43 +00:00
21a92566fd
Build framework-connectivity using module_current
framework-connectivity needs to build only against stable APIs.

Bug: 171540887
Test: m framework-connectivity.impl
Change-Id: I2d51d37d067bf6fe86e4dedf05855a2dd67ed57c

Remi NGUYEN VAN   commited 2021-03-19 06:02:43 +00:00
3b52af9c6e
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API" am: 33457035e7 am: 32f85c2cf3 am: 281f77c93c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640985

Change-Id: I933407d55e33a2cfac44ded44bc58fc0deb9da80

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-03-19 05:32:21 +00:00
6ae29ff41a
[NS03] Mix in other CS-managed properties
These properties are necessary to figure out the maximum
score of a network.

Test: FrameworksNetTests
Change-Id: I48dce20ad4a80597039393dca607e8da829b2a61

Chalard Jean   commited 2021-03-19 13:50:56 +09:00
816ea0324c
[NS02] Mix in validation of the score
Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I9cac3a05ad0c4008599973b12d2c5e4c02233a5c

Chalard Jean   commited 2021-03-19 13:50:56 +09:00
1dddf2671e
Merge "Remove Preconditions usage in TestNetworkSpecifier" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-03-19 04:49:52 +00:00
eed43af3a4
Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" into sc-dev
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2021-03-19 04:49:06 +00:00
6b40be797e
Merge "CaptivePortalData: use CharSequence in VenueFriendlyName API"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-03-19 04:13:36 +00:00
33457035e7
Merge "Add InetAddressCompat" am: 871321f41b am: 2c311c8b74 am: 0afced9423
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645289

Change-Id: I90dba64e96080cbd29f538de6dcb514dea4b6cbd

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-19 02:52:58 +00:00
7e0ffd0ec4
Merge "Move network selection utils to Connectivity" am: d3410e053e am: da9eba3873 am: 73d3166547
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645291

Change-Id: I0b984a01e1688b8484f3500945d0e429e1b3ca00

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-03-19 02:52:41 +00:00
61e1e15104
Expose constants of ConnectivityManager
The callers cannot call the hidden APIs after ConnectivityManager
became a part of mainline module, so expose them for callers.
Also change the value of ACTION_PROMPT_PARTIAL_CONNECTIVITY,
ACTION_PROMPT_LOST_VALIDATION and ACTION_PROMPT_UNVALIDATED because
of API lint errors.

Bug: 172183305
Test: Check private DNS settings is normal, and test NO_INTERNET
      notification can be shown normally.
Change-Id: I715c766ad8e5eb54f4dc67239c1dbca7239506fc

lucaslin   authored and   Chiachang Wang   commited 2021-03-19 10:51:36 +08:00
cf6d450eb8
Revert "Revert "Expose uids related APIs in NetworkRequest and N..."
Revert^2 "Add shims for NetworkRequest"

b72b3ca768fc25ef72dc78f1396b08447b8ef5c6

NetworkRequest is moving into the incoming connectivity mainline
module. The hidden setUids becomes inaccessible outside the
module. Shims for support cts in different API levels will need
to use it to verify the behavior of NetworkRequest. Thus, expose
it to the API surface.

Also, VPN uses getUids and setUids to control network
capabilities. Networkcapabilities is a part of incoming
connectivity mainline module but VPN is not. Thus, exposing these
two methods are needed to allow VPN to continue using it.

Test: make update-api
Bug: 172183305

Change-Id: I4b8e1aa558e3459a932535f9901f4ae86b0ecb67
Merged-In: I107c329d4d7130d488772166eae8b5e7aaa2ff04

Chiachang Wang   commited 2021-03-19 02:12:17 +00:00
628cb1187e
Revert^2 "Replace the usage of UidRange"
b6c51b2c97

UidRange is used in a shared way between ConnectivityService
and VPN through the use of NetworkCapabilities. UidRange will
be part of the ConnectivityService mainline but Vpn.java will
stay in the framework. We need a way to replace the APIs using
UidRange, or to make UidRange system API. The only really
relevant surface here is NetworkCapabilities#{setUids, getUids}.
The need for UidRange could be replaced by an integer Range, so
replace the usage of UidRange by a integer Range in
NetworkCapabilities#{setUids, getUids} and update the relevant
callers.

Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk

Change-Id: I0f679fb5fb8f4fe26461ca4912ca1fdfe7f43c9e
Merged-In: I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9

Chiachang Wang   commited 2021-03-19 02:11:07 +00:00
34ab07c7b3
Expose uids related APIs in NetworkRequest and NetworkCapabilities
NetworkRequest is moving into the incoming connectivity mainline
module. The hidden setUids becomes inaccessible outside the
module. Shims for support cts in different API levels will need
to use it to verify the behavior of NetworkRequest. Thus, expose
it to the API surface.

Also, VPN uses getUids and setUids to control network
capabilities. Networkcapabilities is a part of incoming
connectivity mainline module but VPN is not. Thus, exposing these
two methods are needed to allow VPN to continue using it.

Test: make update-api
Bug: 172183305
Change-Id: I107c329d4d7130d488772166eae8b5e7aaa2ff04

Chiachang Wang   commited 2021-03-19 08:39:07 +08:00
aacf237c27
Remove Preconditions usage in TestNetworkSpecifier
Preconditions is a hidden API utility. It can be easily replace by
inline checks.

Bug: 177046265
Test: m
Change-Id: I3f722075fb9c74e12e40348ba4faad2f0fa67178

Remi NGUYEN VAN   commited 2021-03-19 00:35:27 +00:00
bcd9def075
Revert "Revert "Remove connectivity dependency on Preconditions""
Preconditions.checkNotNull is deprecated to be replaced by
Objects.requireNonNull, and other methods can easily be replaced by
inline checks.

Preconditions is an internal API class that should not be used by
unbundled jars.

Bug: 177046265
Change-Id: I3a67d266b32142c034520acbcdc30f7213db5e13
Test: m

Remi NGUYEN VAN   commited 2021-03-19 00:35:27 +00:00
1818dbb99a
Replace the usage of UidRange
UidRange is used in a shared way between ConnectivityService
and VPN through the use of NetworkCapabilities. UidRange will
be part of the ConnectivityService mainline but Vpn.java will
stay in the framework. We need a way to replace the APIs using
UidRange, or to make UidRange system API. The only really
relevant surface here is NetworkCapabilities#{setUids, getUids}.
The need for UidRange could be replaced by an integer Range, so
replace the usage of UidRange by a integer Range in
NetworkCapabilities#{setUids, getUids} and update the relevant
callers.

Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: I4e5aec6ef1ea02e038fcd7ed117a3b67b69c5cb9

Chiachang Wang   commited 2021-03-19 08:33:07 +08:00
4956b3225d
Merge "Add InetAddressCompat"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-03-18 23:58:16 +00:00
871321f41b
Merge "Move network selection utils to Connectivity"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-03-18 23:57:34 +00:00
d3410e053e
Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE" am: 35b926cc47 am: e0eeb8261e am: ed172af621
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645768

Change-Id: Ia5cedb12112b04885c3f9270b9171c6494b8d2af

Anthony Stange   authored and   Automerger Merge Worker   commited 2021-03-18 18:29:41 +00:00
f968c741b8
Merge "Expose systemReady for SystemServer" am: 56564e061c am: d77b8f6384 am: a71f7d4697
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640142

Change-Id: I95488b39a32ed9086839eab6c457ed6f75472df1

Lucas Lin   authored and   Automerger Merge Worker   commited 2021-03-18 18:27:08 +00:00
7d528eeee3
Merge changes from topic "replaceUidRange" am: 268a9f56f2 am: a0f1955623 am: 4195f030e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626206

Change-Id: Ibc5e47f175a0e5433492f81068da9f42496e660b

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-03-18 18:26:42 +00:00
866e634681
Merge "Expose APIs for Settings" am: e584943ca1 am: 65ec6feca0 am: 9ecd16980c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202

Change-Id: I13a56aa7dcc19efef3dc268fabfa52069360eb18

Chiachang Wang   authored and   Automerger Merge Worker   commited 2021-03-18 18:26:16 +00:00
c93ae1c2a9
Merge "Move constants to MODULE_LIB" am: 8c288603d1 am: 9759496ca0 am: 42e932bc2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640141

Change-Id: I514f5a3d1a4b1498f58170ac652ede394ddf6aeb

Chalard Jean   authored and   Automerger Merge Worker   commited 2021-03-18 18:24:57 +00:00
3303b63519
Merge changes from topic "revert-1626206-replaceUidRange-MSYTKFNGUE"
* changes:
  Revert "Replace the usage of UidRange"
  Revert "Expose uids related APIs in NetworkRequest and NetworkCa..."

Anthony Stange   authored and   Gerrit Code Review   commited 2021-03-18 16:40:53 +00:00
35b926cc47
Revert "Replace the usage of UidRange"
Revert "Add shims for NetworkRequest"

Revert submission 1626206-replaceUidRange

Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...

Change-Id: I6290429db1c8e787f8138b55b98fd92a74ac6402

Anthony Stange   commited 2021-03-18 16:30:59 +00:00
b6c51b2c97
Revert "Expose uids related APIs in NetworkRequest and NetworkCa..."
Revert "Add shims for NetworkRequest"

Revert submission 1626206-replaceUidRange

Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...

Change-Id: I45e08f89533af0d6851add38fecb5c6c114615ae

Anthony Stange   commited 2021-03-18 16:30:59 +00:00
fa6349a6c7
Move network selection utils to Connectivity
NetworkScore, IOnCompleteListener should be in the Connectivity scope,
as they are supporting classes for the ConnectivityManager APIs.

Bug: 181512874
Test: m
Change-Id: I6dc40a80e0bf5f86f5625b657b01eba969d41fcf

Remi NGUYEN VAN   commited 2021-03-18 23:57:26 +09:00
5bfc990e4a
Add InetAddressCompat
Although the InetAddress symbols used by Connectivity are stable core
platform API, and should be usable, the core_current stubs are not yet
part of the module_current API.
Until that is fixed, add an InetAddressCompat utility that calls the
three static methods by reflection.

Test: atest FrameworksNetTests CtsNetTestCases
Bug: 183097033
Change-Id: I797009aeff1d39ae2dc06ef69d2e235689b43c89

Remi NGUYEN VAN   commited 2021-03-18 23:54:04 +09:00
342ddddd9d