Fix incorrect sdk version check in SCV2 device test am: a632356e05
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:
@@ -26,6 +26,7 @@ import static android.net.NetworkStats.UID_TETHERING;
|
||||
import static android.net.RouteInfo.RTN_UNICAST;
|
||||
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.networkstack.tethering.OffloadController.StatsType.STATS_PER_IFACE;
|
||||
import static com.android.networkstack.tethering.OffloadController.StatsType.STATS_PER_UID;
|
||||
@@ -668,7 +669,7 @@ public class OffloadControllerTest {
|
||||
|
||||
if (isAtLeastT()) {
|
||||
mTetherStatsProviderCb.expectNotifyLimitReached();
|
||||
} else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.S) {
|
||||
} else if (isAtLeastS()) {
|
||||
mTetherStatsProviderCb.expectNotifyWarningOrLimitReached();
|
||||
} else {
|
||||
mTetherStatsProviderCb.expectNotifyLimitReached();
|
||||
|
||||
Reference in New Issue
Block a user