frameworks_base.git - frameworks

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \| \| \|	Add static for constant	lucaslin	2021-03-25	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 182963397 Test: atest IpConnectivityMetricsTest Test: atest NetdEventListenerServiceTest Change-Id: I3826b9efc3418a724bd3753b9ad573adc3343b72 Merged-In: I3826b9efc3418a724bd3753b9ad573adc3343b72 (cherry-picked from ag/13975513)
\| \| * \| \| \| \| \|	Get NetworkCapabilities from NetworkCallback	lucaslin	2021-03-25	2	-19/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Register network callback for all networks and record NetworkCapabilities for every networks. Once onDnsEvent is triggered, use the netId it passes in to find the corresponding NetworkCapabilities instead of using netId to create a Network object(hidden API) then get the NetworkCapabilities by ConnectivityManager#getNetworkCapabilities. Bug: 182963397 Test: m Test: atest IpConnectivityMetricsTest Test: atest NetdEventListenerServiceTest Change-Id: I91d68ca33253831b78def1ddeb074ba944a5d6ad Merged-In: I91d68ca33253831b78def1ddeb074ba944a5d6ad (cherry-picked from ag/13959432)
* \| \| \| \| \| \| \|	Merge "Add new network capabilities to support automotive head unit via USB" ↵	Lorenzo Colitti	2021-03-30	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sc-dev
\| * \| \| \| \| \| \|	Add new network capabilities to support automotive head unit via USB	lucaslin	2021-03-29	1	-1/+1
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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
* \| \| \| \| \| \|	Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: f2babbbd67 am: cfe25a8b49 ↵	Lorenzo Colitti	2021-03-30	1	-0/+121
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: c103a8cee9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262 Change-Id: I94e5cf19a7b7dac8400cb7acf80b39a864099956
\| * \| \| \| \| \|	Merge changes If539cf5d,I9765f1c9,I6d3007a1	Lorenzo Colitti	2021-03-30	1	-0/+121
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* changes: Add test coverage for NetworkAgent callbacks. Add a setTeardownDelayMs API to NetworkAgent. Address comments on onBlockedStatusChanged(Network, int) CL.
\| \| * \| \| \| \|	Add test coverage for NetworkAgent callbacks.	Lorenzo Colitti	2021-03-29	1	-0/+121
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tests the onNetworkCreated, onNetworkUnwanted and onNetworkDisconnected callbacks, and the teardown delay timer. Bug: 181941583 Test: atest --rerun-until-failure 500 ConnectivityServiceTest#testNetworkAgentCallbacks Change-Id: If539cf5d01ba23193afab2433ed0ac4e7f0550ec
* \| \| \| \| \|	Merge "Add session ID to VpnTransportInfo" into sc-dev	Lorenzo Colitti	2021-03-30	2	-16/+31
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add session ID to VpnTransportInfo	lifr	2021-03-29	2	-16/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- 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
* \| \| \| \| \| \|	Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: ↵	Sudheer Shanka	2021-03-29	1	-1/+13
\|\ \ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| / / / \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	433c866186 am: 4b3348f115 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550 Change-Id: Ic5c9fb2603a010976bc93e5059e5548ee782005e
\| * \| \| \| \|	Remove NetworkPolicyManager.isUidBlocked() API.	Sudheer Shanka	2021-03-29	1	-1/+13
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It isn't used by ConnectivityService any more and even if it needs such utility method in the future, we could create one which is part of connectivity module and doesn't need to be exposed as part of NetworkPolicyManager API surface. Bug: 183696103 Test: atest ./tests/net/java/com/android/server/ConnectivityServiceTest.java Change-Id: Ie3c681f88e4b2b9bb92d2224c5ea96b074f155d5
* \| \| \| \|	Merge "Support Dual ViLTE stats" am: e456a6c3f8 am: dfcdeef584 am: a62eb108fa	Junyu Lai	2021-03-29	1	-0/+86
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920 Change-Id: I5739265c2747055b0252da7d1fb9e47d61ca111c
\| * \| \| \|	Merge "Support Dual ViLTE stats"	Junyu Lai	2021-03-29	1	-0/+86
\| \|\ \ \ \
\| \| * \| \| \|	Support Dual ViLTE stats	Zhengyu Zhan	2021-03-15	1	-0/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some operator supports multiple VILTE, both two SIM cards can make VILTE call. We need to record VILTE data to different interface. Now NetworkStatsService has only one VILTE data interface: "vt_data0". All VILTE data stats will be recorded in this interface. Bug: 130871087 Test: NetworkStatsServiceTest#testDualVilteProviderStats Change-Id: I000ec756827bc42cac88dd0a2ca6b7999252357e
\| * \| \| \| \|	Merge "Re-implement NetworkUtils#queryUserAccess."	Remi NGUYEN VAN	2021-03-29	1	-1/+1
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Re-implement NetworkUtils#queryUserAccess.	Lorenzo Colitti	2021-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \| \| \| \| \| \|	Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: ↵	Lorenzo Colitti	2021-03-26	2	-3/+42
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	6456359a0e am: 8afa9811c7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214 Change-Id: I4d69b1ce096d83c311620950650460024ae348c0
\| * \| \| \| \| \|	Add unit tests for onBlockedStatusChanged(Network, int).	Lorenzo Colitti	2021-03-26	1	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 165835257 Test: atest FrameworksNetTests Change-Id: I0597df71aa94817835d7a2fb54bfcf9222a34b64
\| * \| \| \| \| \|	Add onBlockedStatusChanged(Network, int) to NetworkCallback.	Lorenzo Colitti	2021-03-26	2	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is similar to onBlockedStatusChanged(Network, boolean) but it allows the callback holder to know the exact reason why networking was blocked. It is useful to privileged system components such as JobScheduler that are able to ignore some blocked reasons but not others. Also add a new BLOCKED_REASON_LOCKDOWN_VPN that is used when networking is blocked because an always-on VPN is in lockdown mode. Also move BLOCKED_METERED_REASON_MASK to ConnectivityManager. This is necessary because ConnectivityService must ensure that the blocked status callbacks are correctly sent when meteredness changes (e.g., a UID that is blocked on metered networks will become unblocked on a network that becomes unmetered). In order to do this it needs to know which reasons apply only on metered networks. Bug: 165835257 Test: unit tests in subsequent CLs in the stack Change-Id: I647db4f5a01280be220288e73ffa85c15bec9370
\| * \| \| \| \| \|	Merge "Add annotation for Vpn#getNetwork()"	Lucas Lin	2021-03-25	1	-10/+6
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Add annotation for Vpn#getNetwork()	lucaslin	2021-03-25	1	-10/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add @VisibleForTesting & @Nullable for Vpn#getNetwork(). - Remove null check in caller side(test) of Vpn#getNetwork() because if the code is working properly, it can never be null. Bug: 182963397 Test: atest FrameworksNetTests Change-Id: Ic52864003fbebd9f4e95d43fefc2e168437b0122 Merged-In: Ic52864003fbebd9f4e95d43fefc2e168437b0122 (cherry-picked from ag/13946573)
\| * \| \| \| \| \| \|	Merge "Remove the usage of NETID_UNSET from Vpn.java"	Lucas Lin	2021-03-25	1	-9/+9
\| \|\\| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove the usage of NETID_UNSET from Vpn.java	lucaslin	2021-03-25	1	-9/+9
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Modify Vpn#getNetId() to Vpn#getNetwork() and uses NETID_UNSET when getNetwork() returns null in ConnectivityServiceTest. Bug: 182963397 Test: atest FrameworksNetTests Change-Id: I69d449705b1dc541287c72af8dc7705dc4733109 Merged-In: I69d449705b1dc541287c72af8dc7705dc4733109 (cherry-picked from ag/13927650)
* \| \| \| \| \| \|	[NS06] Implement the don't-reap mechanism	Chalard Jean	2021-03-25	3	-5/+85
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This exposes a mechanism for network providers to tell the network stack that a given network must be kept up for some specific reason. This is meant to be easier for them than to have to file a request, in particular because there is no guaranteed way to make sure the request will be best matched by any given network. Test: new test for this Bug: 167544279 Change-Id: I238a3ee5ee9262477a23b897e4141769dd1505d1
* \| \| \| \| \| \|	[NS05] Feed network offer callbacks	Chalard Jean	2021-03-25	2	-93/+360
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The design is very simply expressed : An offer is needed for a request if and only if that offer might beat the satisfier for that request. The implementation of "might beat" is NetworkRanker#mightBeat. Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests Bug: 167544279 Change-Id: I0fe911eef2483ecbac48c733d56283b81538690a
* \| \| \| \| \| \|	Merge "Add static for constant" into sc-dev	Lucas Lin	2021-03-25	2	-6/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add static for constant	lucaslin	2021-03-24	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 182963397 Test: atest IpConnectivityMetricsTest Test: atest NetdEventListenerServiceTest Change-Id: I3826b9efc3418a724bd3753b9ad573adc3343b72
* \| \| \| \| \| \| \|	Merge "Add 5G/NR QOS support" am: bd3a33ed9f am: 3e7751c427 am: 80f11bb5bb	Jayachandran Chinnakkannu	2021-03-24	1	-1/+32
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1643762 Change-Id: I74c0d7d771d0b7e067dddc582389f77b8a899542
\| * \| \| \| \| \| \|	Merge "Add 5G/NR QOS support"	Jayachandran Chinnakkannu	2021-03-24	1	-1/+32
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Add 5G/NR QOS support	Jayachandran C	2021-03-23	1	-1/+32
\| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 155176305 Bug: 182317794 Test: atest ConnectivityServiceTest atest QosCallbackTrackerTest Change-Id: Idf6d8a7c3b80bc50a2c1244ceaefea9381d40c2f
\| * / \| \| \| \| \|	Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager.	Sudheer Shanka	2021-03-25	1	-4/+4
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These constants will now be including all the reasons for why an uid's network access can be blocked, instead of only the restrictions that could be imposed by NPMS. Bug: 183473548 Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Merged-In: I4c544415e12adf442fd2415c371b1b70a39c3aa4 Change-Id: I6dcea43fbefa9eac8b5a971b822a5be5422a54b4
* \| \| \| \| \| \|	Merge "Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager." ↵	TreeHugger Robot	2021-03-24	1	-4/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into sc-dev
\| * \| \| \| \| \| \|	Move BLOCKED_REASON_* constants from NPMS into ConnectivityManager.	Sudheer Shanka	2021-03-23	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These constants will now be including all the reasons for why an uid's network access can be blocked, instead of only the restrictions that could be imposed by NPMS. Bug: 183473548 Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Ignore-AOSP-First: Merging internally first to handle conflicts. Change-Id: I4c544415e12adf442fd2415c371b1b70a39c3aa4
* \| \| \| \| \| \| \|	Merge "Add annotation for Vpn#getNetwork()" into sc-dev	Lucas Lin	2021-03-24	1	-10/+6
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add annotation for Vpn#getNetwork()	lucaslin	2021-03-22	1	-10/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add @VisibleForTesting & @Nullable for Vpn#getNetwork(). - Remove null check in caller side(test) of Vpn#getNetwork() because if the code is working properly, it can never be null. Bug: 182963397 Test: atest FrameworksNetTests Change-Id: Ic52864003fbebd9f4e95d43fefc2e168437b0122
* \| \| \| \| \| \| \| \|	Merge "Re-implement NetworkUtils#queryUserAccess." into sc-dev	Remi NGUYEN VAN	2021-03-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Re-implement NetworkUtils#queryUserAccess.	Lorenzo Colitti	2021-03-23	1	-1/+1
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 Change-Id: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc
* \| \| \| \| \| \| \|	Merge "Get NetworkCapabilities from NetworkCallback" into sc-dev	Lucas Lin	2021-03-24	2	-19/+40
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Get NetworkCapabilities from NetworkCallback	lucaslin	2021-03-23	2	-19/+40
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Register network callback for all networks and record NetworkCapabilities for every networks. Once onDnsEvent is triggered, use the netId it passes in to find the corresponding NetworkCapabilities instead of using netId to create a Network object(hidden API) then get the NetworkCapabilities by ConnectivityManager#getNetworkCapabilities. Bug: 182963397 Test: m Test: atest IpConnectivityMetricsTest Test: atest NetdEventListenerServiceTest Change-Id: I91d68ca33253831b78def1ddeb074ba944a5d6ad
* \| \| \| \| \| \| \|	Merge "Remove Notification.DevFlags" into sc-dev	Jeff DeCew	2021-03-23	1	-13/+0
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove Notification.DevFlags	Jeff DeCew	2021-03-23	1	-13/+0
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: 176239013 Test: manual Change-Id: I1aeed1c79e4a829d8829eb08224f9b21fafc50fe
* \| \| \| \| \| \| \|	Merge changes I638ed5cd,I29f15571,I21a22ed1 am: 892589c514 am: 3df38d48ae ↵	Lorenzo Colitti	2021-03-23	2	-23/+103
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| / / / / \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 114c3e3038 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648068 Change-Id: I6d897cdcfb5b0e4809a32312071eb77623754f94
\| * \| \| \| \| \|	Support calling registerDefaultNetworkCallback for another UID.	Lorenzo Colitti	2021-03-22	2	-23/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is to be used by privileged components (e.g., JobScheduler) to request callbacks about the state of other UIDs on the system. Bug: 165835257 Test: new unit test coverage Change-Id: I29f155710394e58c14fcef488db6271d8d83033a
* \| \| \| \| \| \|	Remove NetdService, NetworkStackClient dependency	Remi NGUYEN VAN	2021-03-23	1	-2/+2
\| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Netd should be obtained via getSystemService, and ModuleNetworkStackClient must be used instead of NetworkStackClient for modules. Bug: 171540887 Test: m Change-Id: Ibe703ac56dd70673115cd8b95b44b856a7fc01f3
* \| \| \| \| \|	Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca am: 3042783816 am: 3c975c208f	Lorenzo Colitti	2021-03-22	1	-0/+16
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972 Change-Id: I0420784d706f64b05137074bfcfb58cdc232b83b
\| * \| \| \| \|	Merge changes I90bf7957,If58524b0 am: 7a2f9c06ca	Lorenzo Colitti	2021-03-22	1	-0/+16
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646972 Change-Id: I1c3de9d738a294e9d21314de84384fa89745285d
\| \| * \| \| \|	Fix privileged apps calling registerDefaultNetworkCallback.	Lorenzo Colitti	2021-03-22	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When registerDefaultNetworkCallback is called by an app that has NETWORK_SETTINGS, the UID of the app is forgotten and the request that is filed has an empty UID set. This results in that request matching networks that have UID ranges that do not include it, e.g., VPNs. Fix this by ensuring that the UID ranges are properly set. Bug: 165835257 Test: updated specific tests for this bug Change-Id: I90bf79573342c144d1cfbc2f61a3155fdd5b1fa7
\| \| * \| \| \|	Test a bug with NETWORK_SETTINGS+registerDefaultNetworkCallback.	Lorenzo Colitti	2021-03-22	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, if a process with NETWORK_SETTINGS registers a default network callback, its uid will be ignored and replaced with an empty list of UIDs. This means it will incorrectly match VPNs with any UID range. Add a test for this bug to make it easier to review the upcoming change that fixes it. Bug: 165835257 Test: test-only change Change-Id: If58524b01fdd60045fb7236d17dedf31fb563f99
\| * \| \| \| \|	resolve merge conflicts of 403b7fd0b0a6736bcee1817fb5c774f8c8a040de to ↵	Roshan Pius	2021-03-21	1	-36/+223
\| \|\\| \| \| \| \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	stage-aosp-master Merged-In: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3 Change-Id: Ib9d7923104ac0a60f6af5a3a2d2b7f13bc0262e3
\| \| * \| \|	Merge changes from topics ↵	Treehugger Robot	2021-03-21	2	-121/+331
\| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	"revert-1645768-revert-1626206-replaceUidRange-MSYTKFNGUE-HIUTVTIGIR", "ti_redaction" * changes: TransportInfo: Add a generic redaction mechanism Revert "Revert "Expose uids related APIs in NetworkRequest and N..." Revert^2 "Replace the usage of UidRange"