From acaa7ba313fbfdd3464364f116e897704390a228 Mon Sep 17 00:00:00 2001 From: Sarup Dalwani Date: Thu, 4 Sep 2025 18:57:07 +0000 Subject: [PATCH] Refactor: Use SdkUtil.isAtLeast25Q4 in ConnectivityService This change simplifies the code by calling `SdkUtil.isAtLeast25Q4()` instead of having redundant check in ConnectivityService.Dependencies#isAtLeast25Q4. Test: Existing tests pass. Bug: 443099706 Flag: EXEMPT PURE_REFACTOR Change-Id: I2c581e24982f8f0df0cb023e2e3e4f37015d2f4a --- service/src/com/android/server/ConnectivityService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 1788a91e73..abe1259abf 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -368,6 +368,7 @@ import com.android.net.module.util.LocationPermissionChecker; import com.android.net.module.util.PerUidCounter; import com.android.net.module.util.PermissionUtils; import com.android.net.module.util.RoutingCoordinatorService; +import com.android.net.module.util.SdkUtil; import com.android.net.module.util.SharedLog; import com.android.net.module.util.TcUtils; import com.android.net.module.util.ip.NetlinkMonitor; @@ -1568,7 +1569,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } public boolean isAtLeast25Q4() { - return Build.VERSION.SDK_INT_FULL >= Build.VERSION_CODES_FULL.BAKLAVA_1; + return SdkUtil.isAtLeast25Q4(); } /** Get SystemClock.elapsedRealtime() */