frameworks_base.git - frameworks

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move net unit tests to packages/Connectivity	Remi NGUYEN VAN	2021-05-13	34	-26739/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move the tests together with packages/Connectivity code, so both can be moved to packages/modules/Connectivity together. Also reorganize unit tests in a unit/ directory, as other tests (integration/, common/ etc.) have been added in tests/net since they were created. This makes the directory structure consistent. Test: atest FrameworksNetTests Bug: 187814163 Ignore-AOSP-First: needs per-branch move for merge conflicts Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc
*	Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: ↵	Ken Chen	2021-05-13	1	-19/+35
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	c9d5cd9fbc am: 62258932ff am: a4d53bfa6d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648 Change-Id: I3475e674c3914c4c61fd0a4246c9ee3e7e02c4fb
\| *	Merge "Switch from networkCreate[Physical/Vpn] to networkCreate"	Ken Chen	2021-05-13	1	-19/+35
\| \|\
\| \| *	Switch from networkCreate[Physical/Vpn] to networkCreate	Ken Chen	2021-05-11	1	-19/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	networkCreatePhysical and networkCreateVpn are non-extensible. In order to pass OEM requested VPN type to Netd, we need to migrate to networkCreate API. Modify test code accordingly since networkCreatePhysical and networkCreateVpn have been deprecated on Netd. Bug: 171872481 Test: atest FrameworksNetTests atest atest HostsideVpnTests Change-Id: I50ab8615346c49559c16e815482e7804a1e765c8
\| * \|	Merge "Update PrivateDnsMode from StringDef to IntDef"	Lucas Lin	2021-05-12	2	-17/+15
\| \|\ \
\| \| * \|	Update PrivateDnsMode from StringDef to IntDef	lucaslin	2021-05-05	2	-17/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update PrivateDnsMode from StringDef to IntDef because IntDef is the normal way of representing multiple choices in public API. Also update other related files. Bug: 185311744 Test: 1. make update-api 2. atest FrameworksNetTests CtsNetTestCases CtsNetTestCasesLatestSdk 3. atest FrameworksServicesTests:DevicePolicyManagerTest Change-Id: I23e7ec140066979726d769cabc5f7057bb2167e6 Merged-In: I23e7ec140066979726d769cabc5f7057bb2167e6 (Cherry-picked from ag/14227609)
* \| \| \|	Merge changes from topic "transportinfo-explicit-redaction" into sc-dev	Lorenzo Colitti	2021-05-12	1	-17/+74
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* changes: Immediately redact VcnTransportInfo. Do not automatically redact TransportInfo objects.
\| * \| \| \|	Do not automatically redact TransportInfo objects.	Lorenzo Colitti	2021-05-11	1	-17/+74
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, NetworkCapabilities always redacts the TransportInfo objects it contains whenever a defensive copy is made. This makes it impossible to make a defensive copy on a TransportInfo parcelled from another process without redacting it. Stop redacting by default; instead rely on ConnectivityService explicitly calling NetworkCapabilities' redacting constructor when it returns a NetworkCapabilities object to an app via a callback or synchronous call. This is currently done by - createWithLocationInfoSanitizedIfNecessaryWhenParceled, which is called from callCallbackForRequest, getNetworkCapabilities, and getDefaultNetworkCapabilitiesForUser. - getNetworkCapabilitiesWithoutUids, which is used when sending ConnectivityDiagnosticsManager callbacks. In this method, unconditionally redact all information, which is what the code did previously due to the default redaction setting for empty NetworkCapabilities objects being REDACT_ALL. Bug: 183938194 Test: atest NetworkCapabilitiesTest Test: atest FrameworksNetTests CtsNetTestCases HostsideVpnTests Change-Id: I3108ee94cb0930958e071ba678c3554525b0db82
* \| \| \| \|	Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: 68301eb7cb am: ↵	Paul Hu	2021-05-12	2	-12/+15
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	2b0351ce1e am: 168172c2c0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207 Change-Id: Ie3dd72aa4b8166198884f348f59c77befc229dc0
\| * \| \| \|	Merge "Add MATCH_ANY_USER flag to PackageInfo queries"	Paul Hu	2021-05-12	2	-12/+15
\| \|\ \ \ \
\| \| * \| \| \|	Add MATCH_ANY_USER flag to PackageInfo queries	paulhu	2021-04-26	2	-12/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Querying PackageInfo should have MATCH_ANY_USER flag because some apps are only installed for specific users. If no flag, it will get NameNotFoundException. - Also add missed break on switch case. Bug: 186382373 Test: atests FrameworksNetTests Change-Id: I37c8c42352a9a84ccbe9a37248febcd62b8f59e4
* \| \| \| \| \|	Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: f980436b32 am: 600401154a	Benedict Wong	2021-05-11	1	-15/+85
\|\\| \| \| \| \| \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047 Change-Id: I745687f69366657dc33bfdacd878e06affd6a8ec
\| * \| \| \|	Add internal support for IPsec forward policies	Benedict Wong	2021-05-07	1	-15/+85
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This change adds support for IPsec forward policies, which are necessary for packets to be allowed to be forwarded to another interface, as is the case with tethering. This is necessary and useful only within the system server, and as such is not exposed as a public API. This change is safe, since the addition of a FWD policy on IPsec tunnel interfaces will by default block forwarded traffic (as would be the case without this patch). In the event that the (system) owner of the tunnel requires support for forwarded packets (eg tethering), this patch allows application of transforms in the FWD direction as well. This will be used to ensure that the VCN can be used as the underlying network for the purposes of tethering. Bug: 185495453 Test: atest IpSecServiceTest Test: atest IpSecServiceParameterizedTest Test: manual testing with tethering over VCN Change-Id: I74ecea71f1954029f6fbdbe34598c82e0aac386b
\| * \| \|	Merge "Add getters to NetworkStateSnapshot"	Treehugger Robot	2021-04-29	1	-3/+3
\| \|\ \ \
\| \| * \| \|	Add getters to NetworkStateSnapshot	Aaron Huang	2021-04-22	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address API council feedback, add getters to NetworkStateSnapshot instead of exposing the bare fields directly. (cherry picked from ag/14233655) Bug: 183972826 Test: FrameworksNetTests Merged-In: Id1707753b42ae88d2b95e4bd00a792609434e4f5 Change-Id: Id1707753b42ae88d2b95e4bd00a792609434e4f5
\| * \| \| \|	Merge "Add getters to UnderlyingNetworkInfo"	Treehugger Robot	2021-04-29	1	-7/+7
\| \|\ \ \ \
\| \| * \| \| \|	Add getters to UnderlyingNetworkInfo	Aaron Huang	2021-04-22	1	-7/+7
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address API review feedback, add getters to UnderlyingNetworkInfo instead of exposing fields. Instead of wasting memory by converting this into an array, have migrateTun take a List<String>. In turn, tunAdjustmentInit should also take a List<String>. (cherry picked from ag/14211075) Bug: 183972554 Test: atest android.net.UnderlyingNetworkInfoTest Merged-In: Id59744097208d91298a25ef110ade91a9cf291a1 Change-Id: Id59744097208d91298a25ef110ade91a9cf291a1
\| * \| \| \|	Merge "Rename getAllNetworkStateSnapshot which should be pluralized"	Treehugger Robot	2021-04-29	1	-7/+7
\| \|\ \ \ \
\| \| * \| \| \|	Rename getAllNetworkStateSnapshot which should be pluralized	Aaron Huang	2021-04-22	1	-7/+7
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot should be pluralized so rename the method to getAllNetworkStateSnapshots (cherry picked from ag/14221105) Bug: 183972554 Test: make, FrameworksNetTests FrameworksServicesTests Merged-In: Ic18d17d05984fa2466c962c7843c0ef7183ce77c Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
* \| \| \| \|	Rename Iface APIs to Interface	Aaron Huang	2021-04-28	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address API review feedback, other APIs have been refering to these as "interface" instead of "iface" so migrate the APIs named Iface to Interface. Bug: 183972554 Test: atest android.net.UnderlyingNetworkInfoTest Change-Id: I38b476e762fb57fa88c4a789092d0af6f5330d80
* \| \| \| \|	Merge "Update PrivateDnsMode from StringDef to IntDef" into sc-dev	Lucas Lin	2021-04-27	2	-17/+15
\|\ \ \ \ \
\| * \| \| \| \|	Update PrivateDnsMode from StringDef to IntDef	lucaslin	2021-04-23	2	-17/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update PrivateDnsMode from StringDef to IntDef because IntDef is the normal way of representing multiple choices in public API. Also update other related files. Bug: 185311744 Test: 1. make update-api 2. atest FrameworksNetTests CtsNetTestCases CtsNetTestCasesLatestSdk 3. atest FrameworksServicesTests:DevicePolicyManagerTest Change-Id: I23e7ec140066979726d769cabc5f7057bb2167e6
* \| \| \| \| \|	Merge "wifi data usage: support to get carrier merged wifi network." am: ↵	Les Lee	2021-04-27	1	-5/+10
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bef2f5be94 am: debea981d9 am: 638b67a58f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538743 Change-Id: Ie55770f885bf3c917ad485d2bd8c025b676f12b6
\| * \| \| \| \|	Merge "wifi data usage: support to get carrier merged wifi network."	Les Lee	2021-04-27	1	-5/+10
\| \|\ \ \ \ \
\| \| * \| \| \| \|	wifi data usage: support to get carrier merged wifi network.	lesl	2021-04-19	1	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Carrier merged wifi network is a specific cerrier wifi network which provides the same user experience as mobile. To support data usage accounting for carrier merged wifi, the change provide several APIs in NetworkTemplate: 1. extend buildTemplateWifi so it could be used for matching wifi networks with subscriber Id (IMSI). 2. add buildTemplateCarrier to let NetworkPolicyManagerService creates a single policy for a given carrier regardless of network type. Bug: 176396812 Test: atest -c NetworkTemplateTest Test: atest -c NetworkStatsServiceTest Test: Manual Test with test code on mobile and wifi network. 1. buildTemplateCarrier includes the carrier wifi and mobile usage 2. buildTemplateWifi can get carrier wifi usage and support the filter via subscriberId Change-Id: I667b4adf3eec0bdd3a7385109dd8c1fae8e7be32
\| * \| \| \| \| \|	Merge "Changing per-app default request to TRACK_DEFAULT"	James Mattis	2021-04-26	1	-1/+1
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Changing per-app default request to TRACK_DEFAULT	James Mattis	2021-04-23	1	-1/+1
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing the per-app default request flows to fallback to a request of type TRACK_DEFAULT as opposed to type REQUEST. The main benefit of this change is that these requests will no longer be sent to the factories which is desired. Bug: 180452284 Bug: 176494815 Test: atest FrameworksNetTests atest FrameworksNetIntegrationTests atest CtsNetTestCasesLatestSdk Change-Id: I312e55a54f70aa82953a32ab9369d5afc02b75e5 Merged-In: I312e55a54f70aa82953a32ab9369d5afc02b75e5
\| * \| \| \| \| \|	Merge "Address API review feedback"	Chiachang Wang	2021-04-26	2	-12/+12
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Address API review feedback	Chiachang Wang	2021-04-23	2	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address API review feedback to: - Rename NetworkAgent#setTeardownDelayMs to NetworkAgent#setTeardownDelayMillis - Use getters instead of fields in VpnTransportInfo - Rename registerDefaultNetworkCallbackAsUid to registerDefaultNetworkCallbackForUid in ConnectiivityManager Bug: 183972850 Bug: 185246410 Fix: 184735863 Test: make update-api Test: atest FrameworksNetTests Test: atest CtsNetTestCasesLatestSdk Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868 Merged-In: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
\| * \| \| \| \| \|	Merge "Use connectivity resources in service-connectivity"	Remi NGUYEN VAN	2021-04-23	2	-14/+23
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Use connectivity resources in service-connectivity	Remi NGUYEN VAN	2021-04-23	2	-14/+23
\| \| \| \|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate resource usage to the connectivity resource package. For framework resources that have known overlays, keep a fallback until the overlays can be migrated. Bug: 182125649 Test: atest FrameworksNetTests Merged-In: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0 (clean cherry-pick) Change-Id: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
\| * \| \| \| \|	Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds"	Treehugger Robot	2021-04-22	1	-5/+5
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| \| * \| \| \|	[VCN19] Rename get/setSubIds to get/setSubscriptionIds	junyulai	2021-04-19	1	-5/+5
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test: atest FrameworksNetTests FrameworksVcnTests Fix: 185215036 Merged-In: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7 Change-Id: I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7 (cherry-picked from ag/14198665)
* \| \| \| \|	Merge changes I5125755b,I312e55a5 into sc-dev	James Mattis	2021-04-23	1	-6/+8
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* changes: Updating tests to honor per-app TRACK_DEFAULT Changing per-app default request to TRACK_DEFAULT
\| * \| \| \|	Updating tests to honor per-app TRACK_DEFAULT	James Mattis	2021-04-22	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Per-app APIs in ConnectivityService will now have their fallback request which tracks the system default be of type TRACK_DEFAULT as opposed to REQUEST. Existing tests which expect this fallback request to be sent to network factories need to be updated to validate this change. Bug: 180452284 Bug: 176494815 Test: atest FrameworksNetTests Change-Id: I5125755b3ed1ec535494e2d7a48c0860710ed056
\| * \| \| \|	Changing per-app default request to TRACK_DEFAULT	James Mattis	2021-04-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changing the per-app default request flows to fallback to a request of type TRACK_DEFAULT as opposed to type REQUEST. The main benefit of this change is that these requests will no longer be sent to the factories which is desired. Bug: 180452284 Bug: 176494815 Test: atest FrameworksNetTests atest FrameworksNetIntegrationTests atest CtsNetTestCasesLatestSdk Change-Id: I312e55a54f70aa82953a32ab9369d5afc02b75e5
* \| \| \| \|	Merge "Address API review feedback" into sc-dev	Chiachang Wang	2021-04-23	2	-12/+12
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Address API review feedback	Chiachang Wang	2021-04-20	2	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address API review feedback to: - Rename NetworkAgent#setTeardownDelayMs to NetworkAgent#setTeardownDelayMillis - Use getters instead of fields in VpnTransportInfo - Rename registerDefaultNetworkCallbackAsUid to registerDefaultNetworkCallbackForUid in ConnectiivityManager Bug: 183972850 Bug: 185246410 Fix: 184735863 Test: make update-api Test: atest FrameworksNetTests Test: atest CtsNetTestCasesLatestSdk Test: atest FrameworksMockingServicesTests Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
* \| \| \| \|	Merge "Enable policy ranking" into sc-dev	Chalard Jean	2021-04-22	2	-13/+13
\|\ \ \ \ \
\| * \| \| \| \|	Enable policy ranking	Chalard Jean	2021-04-21	2	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test: Passes all presubmits, been tested in labs Bug: 184834350 Change-Id: If33884aa245bcc8817bbc9c2fdfab035249e7301
* \| \| \| \| \|	Merge "Add getters to UnderlyingNetworkInfo" into sc-dev	Aaron Huang	2021-04-22	1	-7/+7
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Add getters to UnderlyingNetworkInfo	Aaron Huang	2021-04-20	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address API review feedback, add getters to UnderlyingNetworkInfo instead of exposing fields. Instead of wasting memory by converting this into an array, have migrateTun take a List<String>. In turn, tunAdjustmentInit should also take a List<String>. Bug: 183972554 Test: atest android.net.UnderlyingNetworkInfoTest Change-Id: Id59744097208d91298a25ef110ade91a9cf291a1
* \| \| \| \| \| \|	Merge "Add getters to NetworkStateSnapshot" into sc-dev	Aaron Huang	2021-04-21	1	-3/+3
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Add getters to NetworkStateSnapshot	Aaron Huang	2021-04-20	1	-4/+4
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address API council feedback, add getters to NetworkStateSnapshot instead of exposing the bare fields directly. Bug: 183972826 Test: FrameworksNetTests Change-Id: Id1707753b42ae88d2b95e4bd00a792609434e4f5
* \| \| \| \| \|	Merge "Correctly count nri uid request counts" am: 1b7a5e282c am: 0c8d65b489 ↵	James Mattis	2021-04-21	1	-7/+79
\|\ \ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	am: 8bc9d3464c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051 Change-Id: Ibec1f37f2062827cf390eb344dd30447bdabec13
\| * \| \| \| \|	Merge "Correctly count nri uid request counts"	James Mattis	2021-04-21	1	-7/+79
\| \|\ \ \ \ \
\| \| * \| \| \| \|	Correctly count nri uid request counts	James Mattis	2021-04-19	1	-7/+79
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correctly count nri uid request counts in the per-app functionality in connectivity currently used by set profile and set oem network preference APIs. Previously, upon creation, nris would be created prior to removing them. This would cause the uid request counts to artificially increase and incorrectly throw an error if the request count limit was hit even though in actuality an apps request count was valid. E.g., if there was an existing request for per-app functionality and its owning app made a change to the per-app requests, it would double count the existing requests. If the current count was say, one under the limit, an error would be thrown even though it was being replaced which should have resulted in no net change to the request count limit if working correctly. This patch will allow for the requests to be removed prior to creation so that request counts are tabulated correctly. Bug: 185849563 Bug: 183785319 Test: atest FrameworksNetTests Change-Id: I13da0c81256cc02bea6aff2fe1ef99d6f6b0e764
* \| \| \| \| \|	Merge "Refactoring and mocking to make sure unit test doesn't call the real ↵	Nazanin Bakhshi	2021-04-20	1	-7/+23
\|\\| \| \| \| \| \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	service" am: 68bf2c52e5 am: 96b0148cc4 am: bc401f523d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1668228 Change-Id: I92c9fc5f4dcfc0a7f80db78b885945a1021eab20
\| * \| \| \|	Refactoring and mocking to make sure unit test doesn't call the real service	Nazanin	2021-04-19	1	-7/+23
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug: 180938364 Test: utest Change-Id: Ic6a5a84c1d985fa02f8cf52c8c2ff144669b30c1
\| * \| /	[VCN20] Change requestBackgroundNetwork argument order	junyulai	2021-04-16	1	-1/+1
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test: atest FrameworksNetTests FrameworksVcnTests Fix: 185215095 Merged-In: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb Change-Id: Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb (cherry-picked from ag/14198667)