LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Ignore verifying canBeSatisfiedBy() on Android Q" am: dad3c929a3 am: 8203949d52

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1508137

Change-Id: I473bf0f260309a9b1a30b1957714032f1f06b9f6
This commit is contained in:
Lucas Lin
2020-11-24 04:37:14 +00:00
committed by Automerger Merge Worker
parent 0905ca74db 8203949d52
commit 828066d4ea
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/net/common/java/android/net/MatchAllNetworkSpecifierTest.kt
View File

@@ -53,8 +53,13 @@ class MatchAllNetworkSpecifierTest {
assertParcelSane(MatchAllNetworkSpecifier(), 0) assertParcelSane(MatchAllNetworkSpecifier(), 0)
} }
@Test @IgnoreAfter(Build.VERSION_CODES.R) @Test
fun testCanBeSatisfiedBy_BeforeS() { @IgnoreUpTo(Build.VERSION_CODES.Q)
@IgnoreAfter(Build.VERSION_CODES.R)
// Only run this test on Android R.
// The method - satisfiedBy() has changed to canBeSatisfiedBy() starting from Android R, so the
// method - canBeSatisfiedBy() cannot be found when running this test on Android Q.
fun testCanBeSatisfiedBy_OnlyForR() {
// MatchAllNetworkSpecifier didn't follow its parent class to change the satisfiedBy() to // MatchAllNetworkSpecifier didn't follow its parent class to change the satisfiedBy() to
// canBeSatisfiedBy(), so if a caller calls MatchAllNetworkSpecifier#canBeSatisfiedBy(), the // canBeSatisfiedBy(), so if a caller calls MatchAllNetworkSpecifier#canBeSatisfiedBy(), the
// NetworkSpecifier#canBeSatisfiedBy() will be called actually, and false will be returned. // NetworkSpecifier#canBeSatisfiedBy() will be called actually, and false will be returned.