| commit | 650156df801aaf6fa2c915fa4914201b73cb9bdb | [log] [tgz] |
|---|---|---|
| author | Jean Chalard <jchalard@google.com> | Tue Dec 14 11:30:39 2021 +0000 |
| committer | Remi NGUYEN VAN <reminv@google.com> | Wed Aug 31 03:11:17 2022 +0000 |
| tree | 4208447704a03174f0d66fdc1f075f79bea85a0a | |
| parent | f0e4039c2f05a2f695a7f78f23f7d203ab03906f [diff] |
Remove NetworkCapabilities#combine* tests This is already in android12-tests-dev, but is necessary in this branch as it is used for regression testing using internal test configs which are not available on android12-tests-dev. This change only includes the test changes, leaving out the NetworkCapabilities changes which removed some unused code. Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919248 This removes methods in NetworkCapabilities that have been removed from the mainline module in aosp/1919248, and as such the code no longer has these private methods (including on S-V2 because it has the module) and we can't test for them. For this reason these tests should be removed, as they won't pass on a device with a recent module, and they have served no purpose for a long time anyway. Change-Id: I66a25bb9f165c29532c13ceed49000bc1e6a7587 Test: FrameworksNetTests m Bug: 244271253 Bug: 218802331 Merged-In: Ia69c20afa16c2153839891f6e33331caa9da33ff Merged-In: I58462f6d0303803ffd43333b67865c57edef39a3 Merged-In: Id5cca1972e115aeeb1061594dda07e39147630ac