summaryrefslogtreecommitdiff
path: root/tests/net/java/com/android
Commit message (Collapse)AuthorAgeFilesLines
...
| * | [FUI14] Get SSID from NetworkCapabilitiesjunyulai2021-01-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | This allows subsequent patches to remove the need of exposing SSID in NetworkState. Test: atest NetworkStatsServiceTest Bug: 174123988 Change-Id: Ib9ab07c9610954c9a5de035a3aefbf6d0bb0b53b
* | | Merge "Revert "Note network interfaces based on transport""Remi NGUYEN VAN2021-01-261-14/+12
|\ \ \
| * | | Revert "Note network interfaces based on transport"Remi NGUYEN VAN2021-01-261-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ef0d81b294aa8c9d554084209037b7b2604406e6. Reason for revert: Broke build of tests: b/178441996 Change-Id: Idaf35fa02f76852fa8134b0d505467007f6d0f60
* | | | Merge "Note network interfaces based on transport"Remi NGUYEN VAN2021-01-261-12/+14
|\| | |
| * | | Note network interfaces based on transportRemi NGUYEN VAN2021-01-201-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of classifying interfaces by network type in BatteryStats, classify them based on the transports array provided by the NetworkAgent. Network types are deprecated and transports should be used instead. This change allows BatteryStats to stop depending on unstable APIs such as isNetworkTypeMobile. This change also updates nullability annotations in ConnectivityService and NetworkAgentInfo to show that the NetworkCapabilities are non-null (as provided by the network agent) when calling noteNetworkInterfaceTransports. Bug: 174436414 Test: atest atest ConnectivityServiceTest#testBatteryStatsNetworkType \ --rerun-until-failure 40 Change-Id: Icc912473d97a42eef73eb953607c9161fdbeb794
* | | | Merge "Add Qos Callback support" am: 8e39c04b56 am: d52695827d am: cc08384548Chalard Jean2021-01-222-4/+168
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1386623 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If0a123f16951c88cc5881fba8865fae822ba92f0
| * / Add Qos Callback supportDaniel Bright2021-01-212-4/+168
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Provide App Developers Qos related info associated to a bound socket through ConnectivityManager * Qos sessions are generated and filtered by Network Agents and sent back through the Connectivity Service to the API consumer. * The structure of the code within com.android.server is designed to support different types of filters in the the future. * The first type of Qos Attributes are related to EPS Bearers in order support RCS. Bug: 155176305 Test: Added to cts/NetworkAgentTest Test: Added to ConnectivityServiceTest Change-Id: I145dd065d9deeee449eb9695ab3f6c8556ee7c09
* | Merge "Revert "[VCN06] Support request background network"" am: b380466d29 ↵Junyu Lai2021-01-191-7/+3
|\| | | | | | | | | | | | | | | | | | | am: 932ab25ed6 am: 707465a26a Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553864 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I896c2008e29163527b03f031623e1c70d16e1da4
| * Merge "Revert "[VCN06] Support request background network""Junyu Lai2021-01-191-7/+3
| |\
| | * Revert "[VCN06] Support request background network"Junyu Lai2021-01-191-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert submission 1545847-vcn06 Reason for revert: b/177876289 presubmit failure Reverted Changes: I8042ce197:[VCN06.1] Add CTS for request background network If9aaa87b7:[VCN06] Support request background network Change-Id: I9270b02a2d6d1ffcdd83b4f41becaf09a2b91e0a
* | | Merge changes I475502fd,Ibf376a6f,Ia52f9caf am: 58a2186be0 am: 6ff1005d16 ↵Treehugger Robot2021-01-191-8/+141
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4a5b422455 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553958 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic7c2c6289bcc469f43f0293ca4bfd7d6b15ce80a
| * | Merge changes I475502fd,Ibf376a6f,Ia52f9cafTreehugger Robot2021-01-191-8/+141
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Address comments on aosp/1539753, aosp/1542487 and aosp/1547496. Fix propagating underlying caps when a network disconnects. Test for bugs with suspended VPN underlying networks.
| | * | Address comments on aosp/1539753, aosp/1542487 and aosp/1547496.Lorenzo Colitti2021-01-191-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 173331190 Test: test-only change Change-Id: I475502fde55d24e7ae3f7fe9f43c54740c57a9cf
| | * | Fix propagating underlying caps when a network disconnects.Lorenzo Colitti2021-01-191-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aosp/1513052, which generalized support for underlying networks, broke default network switching when the network underlying a VPN disconnects. This is because it calls propagateUnderlyingNetworkCapabilities in the middle of the bookkeeping operations needed when a network is disconnected (specifically, after all satisified requests are removed from the disconnecting network, but before mDefaultNetworkNai is updated). This is completely incorrect because propagateUnderlyingNetworkCapabilities can trigger a network rematch, and running a rematch when the request data structures are inconsistent is obviously wrong. See the test changes in this CL for an example of the damage. Fix this by moving propagateUnderlyingNetworkCapabilities to before the bookeeping operations begin. It must be before mDefaultNetworkNai is updated, because otherwise it will not know that the default network is disconnecting, and it will not be able to propagate capabilities to VPNs that set underlying networks to null (i.e., to the default network). It must be after the nai is removed from mNetworkForNetId because otherwise it will think that the underlying network is still connected. Bug: 173331190 Test: accompanying unit test shows lots of bugs removed Change-Id: Ibf376a6fa4b34d1c96f8506fa8abbb7595a8c272
| | * | Test for bugs with suspended VPN underlying networks.Lorenzo Colitti2021-01-191-0/+115
| | | | | | | | | | | | | | | | | | | | Test: atest --rerun-until-failure 100 ConnectivityServiceTest#testVpnSwitchFromSuspendedToNonSuspended Change-Id: Ia52f9cafef3f49ae70ad135d017e207eb57fddfe
* | | | Merge "[VCN06] Support request background network" am: a18490bdde am: ↵Junyu Lai2021-01-191-3/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1856a60c7b am: 645596b998 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545847 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I12d2cbe4a5fc10a7ec7abf8038c088fe13b02d59
| * | | Merge "[VCN06] Support request background network"Junyu Lai2021-01-191-3/+7
| |\ \ \ | | |/ / | |/| / | | |/
| | * [VCN06] Support request background networkjunyulai2021-01-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be mainly used by VCN management service which will need to hold the networks but preserve the backgrounded-ness of the networks. Test: android.net.ConnectivityManagerTest#testRequestType Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork / --rerun-until-failure 100 Test: ConnectivityServiceTest#testBackgroundNetworks Test: m -j doc-comment-check-docs Bug: 175662146 Change-Id: If9aaa87b7e71c2b695ac7b08858850e975b28bb6
* | | Merge changes Ic5750d4f,I9fa888c9,I4211475f am: b330b5b71a am: 301f376e82 ↵Lorenzo Colitti2021-01-181-50/+311
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bc481755f4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547495 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia036fad7b5070679f382410107a14b0dbfd951e6
| * | Merge changes Ic5750d4f,I9fa888c9,I4211475fLorenzo Colitti2021-01-181-50/+311
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Deflake testNetworkBlockedStatusAlwaysOnVpn Simplify testVpnRestrictedUsers. Add test coverage for LockdownVpnTracker.
| | * | Deflake testNetworkBlockedStatusAlwaysOnVpnLorenzo Colitti2021-01-181-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test flakes about 1% of the time on my device. This is due to the test calling expectNetworkRejectNonSecureVpn() before the handler thread has processed the call to setAlwaysOnVpnPackage. Fix this by waiting for callbacks where it is possible to do so, and by calling waitForIdle where it is not. Test: test-only change Change-Id: Ic5750d4fdf9e7e3654a2b6ade74da6bc5de18fb6
| | * | Simplify testVpnRestrictedUsers.Lorenzo Colitti2021-01-181-21/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code review comments have suggested that this test is too long and difficult to understand. Split it into two tests and put some of the common setup into setup methods and statics. Bug: 173331190 Test: test-only change Change-Id: I9fa888c940d7048f1ba6836a5706fbdb84b5f5c9
| | * | Add test coverage for LockdownVpnTracker.Lorenzo Colitti2021-01-181-29/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add a comment to an existing test. Bug: 173331190 Test: test-only change Change-Id: I4211475f053f0cdf2b804132c52ce5205a772193
* | | | Merge "Enforce that NetworkAgentInfo fields are never null." am: 6231aefd06 ↵Treehugger Robot2021-01-182-23/+22
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e4286ddb3d am: 1a9ac11972 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553734 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If07ff3b1b8dd2d6245cc38c8d25423da5392b6ae
| * | | Enforce that NetworkAgentInfo fields are never null.Lorenzo Colitti2021-01-182-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These fields have been recently audited, confirmed never to be null, and annotated @NonNull. Ensure that they can never become null by throwing exceptions in the codepaths that set them. Also remove some null checks. Test: atest FrameworksNetTests Change-Id: I6ce5bb4d69a990f1c857c599b7e50e372352eb87
* | | | Merge "Remove unused IpConnectivityMetrics in CS" am: 996c17498f am: ↵Paul Hu2021-01-181-6/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d571fa72e1 am: 8246bedd7b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552660 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4bac9e17a3584df017a83472a58c6353bdef845b
| * | | Merge "Remove unused IpConnectivityMetrics in CS"Paul Hu2021-01-181-6/+0
| |\ \ \
| | * | | Remove unused IpConnectivityMetrics in CSpaulhu2021-01-181-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ConnectivityService doesn't call any IpConnectivityMetrics methods, so remove all usages from CS. Bug: 177656797 Test: atest FrameworksNetTests Test: atest FrameworksNetIntegrationTests Change-Id: I2fb3b6b08cd8013eb8f75882f77ca699a2df927e
* | | | | Merge "LocationPermissionChecker: Exempt privileged components from location ↵Roshan Pius2021-01-181-8/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check" am: 2324ff48be am: 3f78d1ce0a am: b8dd50f3b4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550515 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I66afba490765f4eae803d0ea4e2cc3eb54528aa4
| * | | | Merge "LocationPermissionChecker: Exempt privileged components from location ↵Roshan Pius2021-01-181-8/+20
| |\ \ \ \ | | | | | | | | | | | | | | | | | | check"
| | * | | | LocationPermissionChecker: Exempt privileged components from location checkRoshan Pius2021-01-151-8/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a port of the exemption that exists in WifiPermissionsUtil. Settings, sysui, network stack needs to be able to access all network state regardless of location toggle. If we want to move sysui, etc to retrieve WifiInfo via NetworkCapabilities (which is the current plan), this exemption is essential since UI should reflect wifi state regardless of location toggle state. Bug: 162602799 Test: atest LocationPermissionCheckerTest Change-Id: I49ce465eccce27bb7a860d882360436fd9ec19c6
* | | | | | Merge "[VCN05.1] Add unit test for invalid request types" am: 92c241e774 am: ↵Junyu Lai2021-01-161-0/+16
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | da88a37021 am: 702ef867d9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552495 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id0ac3fcc869664fa3465a02b2aaa1a03f65e363d
| * | | | | Merge "[VCN05.1] Add unit test for invalid request types"Junyu Lai2021-01-161-0/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| | * | | [VCN05.1] Add unit test for invalid request typesjunyulai2021-01-151-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest ConnectivityServiceTest#testInvalidRequestTypes Bug: 175662146 Change-Id: I595b0bd1cfb88724581f67942cd3891f95c157ab
* | | | | Merge "Waiting for idle in test" am: a5ff3b537c am: 7c73758907 am: 59afc1a24bJames Mattis2021-01-151-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1550420 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib7ef4eedc0982640b4923885b2deeaefc8081db9
| * | | | Merge "Waiting for idle in test"James Mattis2021-01-151-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Waiting for idle in testJames Mattis2021-01-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Waiting for idle in testRequestsSortedByIdSortsCorrectly to give it time to handle async operations as part of registering network callbacks. Bug: 177376544 Test: atest FrameworksNetTests:ConnectivityServiceTest# testRequestsSortedByIdSortsCorrectly --rerun-until-failure 200 Change-Id: I268c4607d1a4c79e79f1385f014563cea0c2f979
| * | | | Merge "NetworkCapabilities: Embed location senstive TransportInfo"Roshan Pius2021-01-141-9/+42
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | NetworkCapabilities: Embed location senstive TransportInfoRoshan Pius2021-01-131-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: i) Add a new constructor for NetworkCapabilities which accepts whether location sensitive fields need to be parceled or not. Defalts to false on the other constructor. This boolean should only be set on the copy of NetworkCapabilities when sent to apps that hold location permission. (Similar to how sensitive fields are handled in LinkProperties) ii) Add a new makeCopy() method in the TransportInfo interface which accepts whether location sensitive fields need to be parceled or not. iii) Migrate the existing NetworkCapabilities owner UID masking to use this new mechanism (instead of existing masking in ConnectivityService). iv) Always set parcelLocationSensitiveFields to true in the NetworkAgent surface (since that is a privileged surface from the transports to the connectivity service) v) Add a hasSensitiveFields() in TransportInfo interface to avoid perfoming location permission checks for location insensitive TrasnsportInfo. Also, migrate to the new SdkLevel util for isAtLeastR() & isAtLeastS() checks. Bug: 162602799 Test: atest android.net Test: atest com.android.server Change-Id: Ie522d8c75a82ae521ccfd5165823d0c72642e651 Merged-In: Ie522d8c75a82ae521ccfd5165823d0c72642e651
| * | | | Merge changes I28e39400,Ibada8b42Lorenzo Colitti2021-01-142-158/+190
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | * changes: UserManager restricted profile SystemApis Improve testing of CONNECTIVITY_ACTION broadcasts.
| | * | | UserManager restricted profile SystemApisAdam Bookatz2021-01-142-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes two new SystemApis: getRestrictedProfileParent() canHaveRestrictedProfile() Temporarily disables VPN Tests that rely on the old APIs until those tests are updated (b/175883995). Bug: 171529940 Test: atest FrameworksNetTests:com.android.server.connectivity.VpnTest Test: Tests for UserManager SystemApis are TODO awaiting completion of new user test infrastructure (b/163890431) (cherry picked from commit 20ba13f5bc482de37a569c8c791ee5be9e7874b4) Change-Id: I28e39400039631e7d391dc7b0d003e8a38d1f06a
| | * | | Improve testing of CONNECTIVITY_ACTION broadcasts.Lorenzo Colitti2021-01-141-156/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently test CONNECTIVITY_ACTION broadcasts by directly registering BroadcastReceivers with BroadcastInterceptingContext, and making the receivers unregister themselves when all the broadcasts they expect have been received. This works for current test cases, but does not work if anything registers another receiver for CONNECTIVITY_ACTION. In that case, when we unregister the receiver in the receiver's onReceive method, BroadcastInterceptingContext will throw a ConcurrentModificationException because the list of receivers is being modified during iteration. Fix this by adding an ExpectedBroadcast class that stores the receiver and unregisters the receiver only when the test checks that the broadcast was received, which happens after the receiver runs. This is easier to use and also guarantees that the receiver is unregistered even if the test is expecting that the broadcast is never fired. Accordingly, remove mRegisteredReceivers and the code that uses it; it's no longer necessary now that ExpectedBroadcast always unregisters its receivers. Also add a convenience expectConnectivityAction method to expect a CONNECTIVITY_ACTION broadcast with specific contents. This makes the test easier to read and more detailed. Convert some existing tests to this method. While I'm at it, fix a test that was using "mCellNetworkAgent" to represent a wifi network. Bug: 173331190 Test: test-only change Change-Id: Ibada8b4215625e1016d9fd170526206920af76f5
* | | | | Improve testing of CONNECTIVITY_ACTION broadcasts.Lorenzo Colitti2021-01-151-156/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently test CONNECTIVITY_ACTION broadcasts by directly registering BroadcastReceivers with BroadcastInterceptingContext, and making the receivers unregister themselves when all the broadcasts they expect have been received. This works for current test cases, but does not work if anything registers another receiver for CONNECTIVITY_ACTION. In that case, when we unregister the receiver in the receiver's onReceive method, BroadcastInterceptingContext will throw a ConcurrentModificationException because the list of receivers is being modified during iteration. Fix this by adding an ExpectedBroadcast class that stores the receiver and unregisters the receiver only when the test checks that the broadcast was received, which happens after the receiver runs. This is easier to use and also guarantees that the receiver is unregistered even if the test is expecting that the broadcast is never fired. Accordingly, remove mRegisteredReceivers and the code that uses it; it's no longer necessary now that ExpectedBroadcast always unregisters its receivers. Also add a convenience expectConnectivityAction method to expect a CONNECTIVITY_ACTION broadcast with specific contents. This makes the test easier to read and more detailed. Convert some existing tests to this method. While I'm at it, fix a test that was using "mCellNetworkAgent" to represent a wifi network. Bug: 173331190 Test: test-only change Change-Id: Ibada8b4215625e1016d9fd170526206920af76f5
* | | | | Merge "[VCN05] Pass request type when requesting network" am: 539dbe61c5 am: ↵Junyu Lai2021-01-141-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7e0e5b7ba am: 1f1e9e481d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1545846 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4280a78822db2943f0a62a3d729aac3b5f64326d
| * | | | Merge "[VCN05] Pass request type when requesting network"Junyu Lai2021-01-141-2/+2
| |\ \ \ \
| | * | | | [VCN05] Pass request type when requesting networkjunyulai2021-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, ConnectivityService decides the request type by whether NetworkCapabilities is null when handling request network. However, to fulfill the need of firing background request via ConnectivityManager in the follow-up patches, the request type is needed to pass into ConnectivityService. This change also make ConnectivityService utilizes the passed request type. Test: atest ConnectivityManagerTest#testRequestType Bug: 175662146 Change-Id: I3bc172bca1217c8020db45057a621d0745d43b3c
* | | | | | Merge changes from topic "revert-13329427-revert-13274595-XTPTORCRLV-WLDUPFEJWD"Roshan Pius2021-01-141-9/+42
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: NetworkControllerWifiTest: Fix unit tests Revert "Revert "NetworkCapabilities: Embed location senstive Tra..."
| * | | | | | Revert "Revert "NetworkCapabilities: Embed location senstive Tra..."Roshan Pius2021-01-131-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert^2 "WifiLocationTest: Add test for Wifi TransportInfo" b548aac6081a6899e966d7a8d961f2a47147e244 Exempt-From-Owner-Approval: Reland of approved CL Bug: 162602799 Bug: 177390648 Test: atest com.android.systemui.statusbar.policy.NetworkControllerWifiTest Change-Id: Iec8d1441e8d02ff43037fdcb0c90065adff8e716
* | | | | | | Merge "UserManager restricted profile SystemApis"Adam Bookatz2021-01-132-2/+10
|\ \ \ \ \ \ \
| * | | | | | | UserManager restricted profile SystemApisAdam Bookatz2021-01-132-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes two new SystemApis: getRestrictedProfileParent() canHaveRestrictedProfile() Temporarily disables VPN Tests that rely on the old APIs until those tests are updated (b/175883995). Bug: 171529940 Test: atest FrameworksNetTests:com.android.server.connectivity.VpnTest Test: Tests for UserManager SystemApis are TODO awaiting completion of new user test infrastructure (b/163890431) Change-Id: I28e39400039631e7d391dc7b0d003e8a38d1f06a
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-07 17:44:23 +0000