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

Fix incorrect sdk version check in SCV2 device test am: a632356e05

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2103110

Change-Id: I2b4a82032dd85f7c70d7e559335c8d4fed6e238d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Frank
2022-05-24 10:53:43 +00:00
committed by Automerger Merge Worker
parent f2d3148059 a632356e05
commit 6bfe9da357
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Tethering/tests/unit/src/com/android/networkstack/tethering/OffloadControllerTest.java
View File

@@ -26,6 +26,7 @@ import static android.net.NetworkStats.UID_TETHERING;
import static android.net.RouteInfo.RTN_UNICAST; import static android.net.RouteInfo.RTN_UNICAST;
import static android.provider.Settings.Global.TETHER_OFFLOAD_DISABLED; import static android.provider.Settings.Global.TETHER_OFFLOAD_DISABLED;
import static com.android.modules.utils.build.SdkLevel.isAtLeastS;
import static com.android.modules.utils.build.SdkLevel.isAtLeastT; import static com.android.modules.utils.build.SdkLevel.isAtLeastT;
import static com.android.networkstack.tethering.OffloadController.StatsType.STATS_PER_IFACE; import static com.android.networkstack.tethering.OffloadController.StatsType.STATS_PER_IFACE;
import static com.android.networkstack.tethering.OffloadController.StatsType.STATS_PER_UID; import static com.android.networkstack.tethering.OffloadController.StatsType.STATS_PER_UID;
@@ -668,7 +669,7 @@ public class OffloadControllerTest {
if (isAtLeastT()) { if (isAtLeastT()) {
mTetherStatsProviderCb.expectNotifyLimitReached(); mTetherStatsProviderCb.expectNotifyLimitReached();
} else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.S) { } else if (isAtLeastS()) {
mTetherStatsProviderCb.expectNotifyWarningOrLimitReached(); mTetherStatsProviderCb.expectNotifyWarningOrLimitReached();
} else { } else {
mTetherStatsProviderCb.expectNotifyLimitReached(); mTetherStatsProviderCb.expectNotifyLimitReached();