summaryrefslogtreecommitdiff
path: root/tests/net/java
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | Stop using IIpConnectivityMetrics in ConnectivityService.Lorenzo Colitti2021-01-122-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, ConnectivityService calls the IpConnectivityMetrics service class directly to log default network events. This is incompatible with ConnectivityService being in a mainline module. Replace direct access to IIpConnectivityMetrics with public methods in IpConnectivityLog, which is @SystemApi class. The new methods are not yet @SystemApi, but they can be made so if desired. Alternatively, these metrics could be deleted. Also remove the IpConectivityMetrics service from the service-connectivity JAR, and go back to starting it from SystemServer.java, which is what was happening a few hours ago before aosp/1542626 was merged. Test: builds, boots Test: atest FrameworksNetTests Test: "dumpsys connmetrics" shows events, including default network events Change-Id: I9d6147d93590363a2f8f83f39f05c03d001b4851
* | | | | | | Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 ↵Ken Chen2021-01-121-1/+73
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fac52cd24b am: 3da4638c49 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I159a4a4115f200e78bc368d9db2997c58d0858b8
| * | | | | | Let ConnectivityService control the socket closureKen Chen2021-01-121-1/+73
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Netd currently calls maybeCloseSockets before adding/removing users for network. The task should be moved from netd to CS. In this way, we can handle WiFi lingering more easily in the future. Test: atest HostsideVpnTests Test: atest FrameworksNetTests Change-Id: Icf8125e8552c89da367a67f48611ed193a1a343d
* | | | | | Merge "Remove Vpn#isBlockingUid." am: 2982364969 am: 88f04b79bd am: 316966eb7eLorenzo Colitti2021-01-122-77/+54
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I141c6e1d0585f81e2ab14ad96499beb112eebdb5
| * | | | | Merge "Remove Vpn#isBlockingUid."Lorenzo Colitti2021-01-122-77/+54
| |\ \ \ \ \
| | * | | | | Remove Vpn#isBlockingUid.Lorenzo Colitti2021-01-082-77/+54
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code is no longer used. Delete it and the tests for it. One of the tests checks that when a restricted profile is added, the lockdown UID rules are updated to cover that profile as well. ConnectivityServiceTest does not currently has coverage for this, so add it. Bug: 173331190 Test: moved unit test from VpnTest to ConnectivityServiceTest Change-Id: Ic350b90946870890bf031668bb5c201037b0bd15
* | | | | | Merge "Improve error message when testing network factory" am: e8cd6e4fef ↵Treehugger Robot2021-01-121-40/+44
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 324e0f161a am: 795ef23ed8 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4b421f7b2895a24912d37d73dc011fa440440cf2
| * | | | | Merge "Improve error message when testing network factory"Treehugger Robot2021-01-121-40/+44
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Improve error message when testing network factoryjunyulai2021-01-061-40/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when network factory is under testing, but failed without terminating the network factory. The mocked network factory will stay registered and trigger another assertion fail in teardown(). Thus, the test suite will only shows the callstack that generated in teardown() instead of the original fail. The error message is misleading and not useful at all. Thus, safely terminate and quit mocked network factory after testing to prevent assertion fail in teardown(). Test: atest ConnectivityServiceTest#testMobileDataAlwaysOn Bug: 175180558 Change-Id: I0f96332cc05221e576bd792c6cd26d9dccb4e228
* | | | | | Merge "Show LargeIcon as wide for apps targeting S."Jeff DeCew2021-01-081-3/+21
|\ \ \ \ \ \
| * | | | | | Show LargeIcon as wide for apps targeting S.Jeff DeCew2021-01-071-3/+21
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * This does not inhibit the grouping behavior which demotes this image and shows it in a smaller square area on the left. * This also converts the Notification class to calculate margins and sizes in DIP instead of PX, as that is more resilient. Fixes: 175409684 Test: atest NotificationTemplateTest Change-Id: I35d28c8df341dbbac2774026c6ca749e296c0482
* | | | | | Merge "Pivot network statistics to use DataInput/Output." am: 5b322f10be am: ↵Treehugger Robot2021-01-081-4/+3
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c5eff8d5c am: fe39a927b5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I44be7ea64d012f35d312ae3b039b0fd7e37e9d60
| * | | | Merge "Pivot network statistics to use DataInput/Output."Treehugger Robot2021-01-081-4/+3
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Pivot network statistics to use DataInput/Output.Jeff Sharkey2021-01-061-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using these generalized interfaces is more flexible, since it enables us to pivot the implementation being used internally. In particular, an upcoming CL will pivot them to use a more efficient alternative. This is a no-op refactoring. Bug: 176777285 Test: atest FrameworksNetTests CtsNetTestCases Change-Id: Ibd4717174cf1f136e9d5d80172ecb6e493265306
* | | | | Merge changes Iec22ff63,Iaca8a7cc am: 5a5613209d am: 26e29afb3e am: bdba76fe13Lorenzo Colitti2021-01-072-34/+69
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528211 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I293366c6aac42f776ff23277a707d8c2ae0fd1b0
| * | | | Inform ConnectivityService about always-on VPN lockdown.Lorenzo Colitti2021-01-072-34/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when an always-on VPN is set in lockdown mode, Vpn configures prohibit UID rules in netd directly and does not inform ConnectivityService of the fact. This means that ConnectivityService cannot send NetworkCallbacks that tells apps that they are blocked or unblocked. It also means that ConnectivityService has to take the mVpns lock and call into Vpn to allow synchronous APIs such as getActiveNetwork to return BLOCKED if the app is blocked. Move all this to ConnectivityService: - Add a setRequireVpnForUids API to ConnectivityManager, and have that pass the routing rules to netd. - Update VpnTest to expect calls to ConnectivityManager instead of to netd. - Whenever setRequireVpnForUids is called, ensure that ConnectivityService sends onBlockedStatusChanged to the affected callbacks. - Update existing unit tests to check for callbacks. - Add a way to find the VPN that applies to a given UID without taking the VPN lock, by instead scanning all connected VPNs. Use this as a replacement for direct access to mVpns. For simplicity, and in order to ensure proper ordering between the NetworkCallbacks sent for VPNs connecting and disconnecting, process blocked UID ranges on the handler thread. This means that when setRequireVpnForUids returns, the rule changes might not have been applied. This shouldn't impact apps using network connectivity, but it might mean that apps setting an always-on package, and then immediately checking whether networking is blocked, will see a behaviour change. Bug: 173331190 Fix: 175670887 Test: new test coverage in ConnectivityServiceTest Test: atest MixedDeviceOwnerTest#testAlwaysOnVpn \ MixedDeviceOwnerTest#testAlwaysOnVpnLockDown \ MixedDeviceOwnerTest#testAlwaysOnVpnAcrossReboot \ MixedDeviceOwnerTest#testAlwaysOnVpnPackageUninstalled \ MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackage \ MixedDeviceOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced \ MixedDeviceOwnerTest#testAlwaysOnVpnPackageLogged \ MixedProfileOwnerTest#testAlwaysOnVpn \ MixedProfileOwnerTest#testAlwaysOnVpnLockDown \ MixedProfileOwnerTest#testAlwaysOnVpnAcrossReboot \ MixedProfileOwnerTest#testAlwaysOnVpnPackageUninstalled \ MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage \ MixedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced \ MixedProfileOwnerTest#testAlwaysOnVpnPackageLogged \ MixedManagedProfileOwnerTest#testAlwaysOnVpn \ MixedManagedProfileOwnerTest#testAlwaysOnVpnLockDown \ MixedManagedProfileOwnerTest#testAlwaysOnVpnAcrossReboot \ MixedManagedProfileOwnerTest#testAlwaysOnVpnPackageUninstalled \ MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackage \ MixedManagedProfileOwnerTest#testAlwaysOnVpnUnsupportedPackageReplaced \ MixedManagedProfileOwnerTest#testAlwaysOnVpnPackageLogged Test: atest FrameworksNetTests HostsideVpnTests \ CtsNetTestCases:VpnServiceTest \ CtsNetTestCases:Ikev2VpnTest Change-Id: Iaca8a7cc343aef52706cff62a7735f338cb1b772
* | | | | Merge "Replace INetworkPolicyManager to NetworkPolicyManager" am: 8918df04a5 ↵Paul Hu2021-01-071-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a3d3b58a30 am: 37daa95e95 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534908 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id6685f26e6f7c7d9b0da6edd147f1aa37e16d676
| * | | | Merge "Replace INetworkPolicyManager to NetworkPolicyManager"Paul Hu2021-01-071-4/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Replace INetworkPolicyManager to NetworkPolicyManagerpaulhu2021-01-051-4/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Connectivity service is going to become a mainline module which will not able to access hidden APIs. Thus, use formal API Context#getSystemService() to get network policy service instead of hidden API ServiceManager#getService(). Bug: 170598012 Test: atest FrameworksNetTests FrameworksNetIntegrationTests Change-Id: I4f286264b5800b2b922f85a76ddd20d64d53000a
| * | | Merge "Migrate away from AsyncChannel in NetworkAgent"Lorenzo Colitti2021-01-062-13/+7
| |\ \ \ | | |/ / | |/| |
| | * | Migrate away from AsyncChannel in NetworkAgentRemi NGUYEN VAN2020-12-252-13/+7
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use two oneway binder interfaces instead. The interfaces post messages to handlers as was implemented before, but provide a more strictly defined interface, with less hops between NetworkAgent, AsyncChannel, and ConnectivityService. The actual public interface is the NetworkAgent @SystemApi: the binder interface is an internal implementation detail. Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk Bug: 173574274 Merged-In: Ie364ab50f416e7821e70f4539a881eea828e1256 Change-Id: Ie364ab50f416e7821e70f4539a881eea828e1256
* | | Merge "Add test for increment operation count on non-default network" am: ↵Junyu Lai2020-12-281-6/+51
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d41248947 am: f77979a320 am: 609657c45d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1517499 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I53607908e07f8c7c94e1c2ac8632ebb645ea469a
| * | Merge "Add test for increment operation count on non-default network"Junyu Lai2020-12-281-6/+51
| |\ \
| | * | Add test for increment operation count on non-default networkjunyulai2020-12-241-6/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, when the caller increment operation count, the count will be blamed on the active default network even though the traffic is all generated on other networks. This is kind of weird. But in order to change the behavior, extend test coverage first. Test: atest com.android.server.net.NetworkStatsServiceTest#testOperationCount_nondefault_traffic Bug: 174123988 Change-Id: Ia5b5aa3601de15bb9ee5a29f6d184d122f1c5352
* | | | Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" ↵Chiachang Wang2020-12-281-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dcb4051101 am: 8495b1b1dc am: 67cba56eff Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531806 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I992dd2f78c0f7334bbe97a03faba161d09a03a71
| * | | Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged"Chiachang Wang2020-12-281-3/+3
| |\ \ \
| | * | | [IT4.2] Update argument type of interfaceClassDataActivityChangedChiachang Wang2020-12-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The argument type of interfaceClassDataActivityChanged takes a string for the network type. It requires both the receivers and NMS to do type transformation. The transformation is a redundant work. Update it to take integer directly and rename to understandable naming. Bug: 170598012 Test: atest FrameworksNetTests Change-Id: Ibe9fa7a1b71af2dab916b5d615742e77e4174c39
* | | | | Merge "[Mainline] Migrate ProxyInfo" am: 3c3711dffd am: 5565118666 am: ↵Serik Beketayev2020-12-251-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40e7949c5f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1506616 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia6f5bf74bf461f762472ea1d88553db3b9719c80
| * | | | Merge "[Mainline] Migrate ProxyInfo"Serik Beketayev2020-12-251-1/+3
| |\ \ \ \
| | * | | | [Mainline] Migrate ProxyInfoSerik Beketayev2020-12-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 173455434 Test: atest FrameworksNetTests Change-Id: I924aed710b62a0c91b888a9e04ac2c90cdfd88d0
* | | | | | Merge "Migrate away from AsyncChannel in NetworkAgent"Remi NGUYEN VAN2020-12-252-13/+7
|\ \ \ \ \ \
| * | | | | | Migrate away from AsyncChannel in NetworkAgentRemi NGUYEN VAN2020-12-232-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use two oneway binder interfaces instead. The interfaces post messages to handlers as was implemented before, but provide a more strictly defined interface, with less hops between NetworkAgent, AsyncChannel, and ConnectivityService. The actual public interface is the NetworkAgent @SystemApi: the binder interface is an internal implementation detail. Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk Change-Id: Ie364ab50f416e7821e70f4539a881eea828e1256
* | | | | | | Merge "Update usage of allowlist/denylist in some method names/comments." ↵Sudheer Shanka2020-12-241-4/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 771aa062b9 am: b4c68c4216 am: 0b39593d11 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402789 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I40b28e3be169fbc59f8b889871ed938b45de2fab
| * | | | | | Merge "Update usage of allowlist/denylist in some method names/comments."Sudheer Shanka2020-12-241-4/+4
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Update usage of allowlist/denylist in some method names/comments.Sudheer Shanka2020-12-241-4/+4
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a previous change (https://r.android.com/1394342), we did a mass update of whitelist->allowlist and blacklist->denylist in network policy related code. Updating some usages of those (like allowlisted to allowed) to make them sound natural. Test: atest services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java Test: atest services/tests/servicestests/src/com/android/server/NetworkManagementInternalTest.java Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Change-Id: I6d34b0bd3cdb64d5872874fd9378bfc962a24f8d
* | | | | | Merge "Have NetworkPolicyManagerService create MultipathPolicyTracker" am: ↵Aaron Huang2020-12-241-4/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a34d9a7af1 am: 8f96256d85 am: 27ace52564 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519960 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I023815a53f01a0459b94033b7e2fa2ed91cca86a
| * | | | | Have NetworkPolicyManagerService create MultipathPolicyTrackerAaron Huang2020-12-231-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make connectivity service mainline, this patch makes MultipathPolicyTracker as a submodule of NetworkPolicyManagerService to remove the dependencies of ConnectivityService. Bug: 175015282 Test: FrameworksNetTests Change-Id: I82a7c62069ffd0683deb2f5ce2f99de120a2a16f
* | | | | | Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged" am: ↵Chiachang Wang2020-12-231-9/+8
|\| | | | | | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baef452e38 am: 04aa5eac85 am: a817ecd4b5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1523339 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieafdf569c13b1421c18fa3086827e6e432b498d7
| * | | | Merge "[IT04] Add uid as parameter of interfaceClassDataActivityChanged"Chiachang Wang2020-12-231-9/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [IT04] Add uid as parameter of interfaceClassDataActivityChangedChiachang Wang2020-12-221-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add uid into interfaceClassDataActivityChanged in INetworkManagementEventObserver. This helps the listeners to use BaseNetworkObserver to listen for target evnets instead of using whole INetdUnsolicitedEventListener with no-op in other event that listeners do not care about. Bug: 170598012 Test: m ; atest FrameworksNetTests Change-Id: I2a42a522c2ff9b1e0be88261a8574bb7f5292fa6
* | | | | Merge "Split NetworkUtils and NetworkUtilsInternal" am: 3ed4fd3a89 am: ↵Remi NGUYEN VAN2020-12-233-61/+90
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 635d60201d am: edc6b0fb67 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1513140 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ief9d6a1fae360dbe1c43d5d6bac4dad5850c004b
| * | | | Merge "Split NetworkUtils and NetworkUtilsInternal"Remi NGUYEN VAN2020-12-233-61/+90
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Split NetworkUtils and NetworkUtilsInternalRemi NGUYEN VAN2020-12-073-61/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkUtils is planned to move to a dedicated JAR for connectivity classes, while NetworkUtilsInternal would stay in the frameworks-minus-apex JAR, in the com.android.internal.net package. Bug: 171540887 Test: m, boots, wifi working atest FrameworksNetTests Change-Id: I3d38d72ad23a4bf84af823c7baeb6fed25c0665f
| * | | | Merge "Move module utils to the module package."Chalard Jean2020-12-211-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Move module utils to the module package.Chalard Jean2020-12-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: FrameworksWifiTest FrameworksNetTest Change-Id: If5d1e4a58fb2d6d9544e6d01995dabe445cf1f25 Merged-In: I067eeecd458c34b7f2fbfa439072682661ac750c
* | | | | Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61e am: 87eadad550 am: ↵James Mattis2020-12-221-3/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 327f96aa66 am: fc0d3cf553 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1507701 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id8d45a68283ab29f6928628ebf852143793aff76
| * | | | Merge changes I177ec607,I68f364b4,Ib3b9f52c,If040d61eJames Mattis2020-12-201-3/+12
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: nits removing extra space, change method name, etc maybeLogBlockedStatusChanged multilayer requests Update getSignalStrengthThresholds for multilayer Update to unneeded for multilayered requests
| | * | | nits removing extra space, change method name, etcJames Mattis2020-12-101-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor cleanup as per nit comments on approved CLs in the relation chain. Namely: - removing an extranous space - changing requestsSortedById() to be package private - changing releaseNetworkRequest() name to releaseNetworkRequests() - adding final in a couple spots - added some test requests in testDumpDoesNotCrash() Bug: 173145245 Bug: 173292541 Bug: 173146509 Bug: 171991028 Test: atest FrameworksNetTests Change-Id: I177ec6072a44acd247022b65b56e90cc231094b9
* | | | | Merge changes Ie0b32460,I21028457,I82754375 am: 29e5346c24 am: e8c002d842 ↵Lorenzo Colitti2020-12-162-23/+314
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 71f05fff22 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529778 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2e28cde0569c263c6afe5ad722be4060912eae0e
| * | | | Allow ConnectivityServiceTest to change the calling UID.Lorenzo Colitti2020-12-151-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow ConnectivityServiceTest to change the UID by replacing static calls to Binder.getCallingUid() with a method that can be mocked. Add registerNetworkCallbackAsUid as an initial way to exercise this, and add some test coverage to the always-on lockdown test to confirm that things are working as expected. Bug: 173331190 Test: new unit tests Change-Id: Ie0b32460e20e5906a0f479191e11a062f21cc608