Upgrade minSdk to 24

yongce · yongce · commit 46e8369ced42 · 2023-05-20T21:56:58.000+08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,7 +24,6 @@ jobs:
       fail-fast: false
       matrix:
         api-level: [24, 29, 31, 33]
-        target: [google_apis]
 
     steps:
     - name: checkout
@@ -45,7 +44,6 @@ jobs:
         arch: x86_64
         profile: Nexus 6
         cores: 4
-        avd-name: macOS-avd-x86-${{ matrix.api-level }}
         emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
         disable-animations: true
         script: ./gradlew connectedCheck mergeAndroidReports --continue
diff --git a/baseLib/src/androidTest/java/me/ycdev/android/lib/common/async/AsyncTaskQueueTest.kt b/baseLib/src/androidTest/java/me/ycdev/android/lib/common/async/AsyncTaskQueueTest.kt
@@ -62,7 +62,7 @@ class AsyncTaskQueueTest {
 
         // Waiting for the task done
         assertThat(latch.count).isEqualTo(2)
-        latch.await(1000, TimeUnit.MILLISECONDS)
+        latch.await(1500, TimeUnit.MILLISECONDS)
         assertThat(latch.count).isEqualTo(1)
         latch.await(2000, TimeUnit.MILLISECONDS)
         assertThat(latch.count).isEqualTo(0)
diff --git a/baseLib/src/androidTest/java/me/ycdev/android/lib/common/net/NetworkUtilsTest.kt b/baseLib/src/androidTest/java/me/ycdev/android/lib/common/net/NetworkUtilsTest.kt
@@ -1,7 +1,6 @@
 package me.ycdev.android.lib.common.net
 
 import android.content.Context
-import android.os.SystemClock
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
@@ -14,8 +13,6 @@ import me.ycdev.android.lib.common.net.NetworkUtils.NETWORK_TYPE_MOBILE
 import me.ycdev.android.lib.common.net.NetworkUtils.NETWORK_TYPE_NONE
 import me.ycdev.android.lib.common.net.NetworkUtils.NETWORK_TYPE_WIFI
 import me.ycdev.android.lib.common.net.NetworkUtils.NetworkType
-import me.ycdev.android.lib.common.utils.SystemSwitchUtils
-import org.junit.Assert.fail
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.Timeout
@@ -32,7 +29,7 @@ class NetworkUtilsTest {
         // for any network
         val context = ApplicationProvider.getApplicationContext<Context>()
 
-        @NetworkType var networkType = NetworkUtils.getNetworkType(context)
+        @NetworkType val networkType = NetworkUtils.getNetworkType(context)
         assertWithMessage("check all return values")
             .that(networkType)
             .isAnyOf(
@@ -41,47 +38,6 @@ class NetworkUtilsTest {
                 NETWORK_TYPE_COMPANION_PROXY,
                 NETWORK_TYPE_NONE
             )
-
-        val oldNetworkType = NetworkUtils.getNetworkType(context)
-        if (SystemSwitchUtils.isWifiEnabled(context)) {
-            // disable WiFi
-            SystemSwitchUtils.setWifiEnabled(context, false)
-            waitForWiFiConnected(context, false)
-            if (!SystemSwitchUtils.isWifiEnabled(context)) {
-                networkType = NetworkUtils.getNetworkType(context)
-                assertWithMessage("wifi disabled")
-                    .that(networkType)
-                    .isAnyOf(NETWORK_TYPE_MOBILE, NETWORK_TYPE_COMPANION_PROXY, NETWORK_TYPE_NONE)
-
-                if (oldNetworkType == NETWORK_TYPE_WIFI) {
-                    // enable WiFi
-                    SystemSwitchUtils.setWifiEnabled(context, true)
-                    if (!waitForWiFiConnected(context, true)) {
-                        fail("waitForWiFiConnected(true) timeout")
-                    }
-                    networkType = NetworkUtils.getNetworkType(context)
-                    assertWithMessage("wifi enabled")
-                        .that(networkType).isEqualTo(NETWORK_TYPE_WIFI)
-                }
-            }
-        } else {
-            // enable WiFi
-            SystemSwitchUtils.setWifiEnabled(context, true)
-            waitForWiFiConnected(context, true)
-            if (SystemSwitchUtils.isWifiEnabled(context)) {
-                networkType = NetworkUtils.getNetworkType(context)
-                assertWithMessage("wifi enabled 2")
-                    .that(networkType).isAnyOf(NETWORK_TYPE_WIFI, oldNetworkType)
-
-                // disable WiFi
-                SystemSwitchUtils.setWifiEnabled(context, false)
-                waitForWiFiConnected(context, false)
-                networkType = NetworkUtils.getNetworkType(context)
-                assertWithMessage("wifi disabled 2")
-                    .that(networkType)
-                    .isAnyOf(NETWORK_TYPE_MOBILE, NETWORK_TYPE_COMPANION_PROXY, NETWORK_TYPE_NONE)
-            }
-        }
     }
 
     @Test
@@ -93,13 +49,6 @@ class NetworkUtilsTest {
         assertWithMessage("check all return values")
             .that(networkType)
             .isAnyOf(NETWORK_TYPE_2G, NETWORK_TYPE_3G, NETWORK_TYPE_4G, NETWORK_TYPE_NONE)
-
-        // disable WiFi
-        SystemSwitchUtils.setWifiEnabled(context, false)
-        waitForWiFiConnected(context, false)
-        assertWithMessage("check all return values")
-            .that(networkType)
-            .isAnyOf(NETWORK_TYPE_2G, NETWORK_TYPE_3G, NETWORK_TYPE_4G, NETWORK_TYPE_NONE)
     }
 
     @Test
@@ -128,21 +77,4 @@ class NetworkUtilsTest {
     fun test_openHttpURLConnection() {
         // TODO
     }
-
-    private fun waitForWiFiConnected(cxt: Context, connected: Boolean): Boolean {
-        val timeStart = SystemClock.elapsedRealtime()
-        while (true) {
-            if (SystemClock.elapsedRealtime() - timeStart >= 1000 * 15) {
-                return false // timeout
-            }
-
-            if (connected && NetworkUtils.getNetworkType(cxt) == NETWORK_TYPE_WIFI) {
-                break
-            } else if (!connected && NetworkUtils.getNetworkType(cxt) != NETWORK_TYPE_WIFI) {
-                break
-            }
-            SystemClock.sleep(100)
-        }
-        return true
-    }
 }
diff --git a/baseLib/src/androidTest/java/me/ycdev/android/lib/common/utils/SystemSwitchUtils.kt b/baseLib/src/androidTest/java/me/ycdev/android/lib/common/utils/SystemSwitchUtils.kt
@@ -13,11 +13,4 @@ object SystemSwitchUtils {
         val wifiState = wifiMgr.wifiState
         return wifiState == WifiManager.WIFI_STATE_ENABLED || wifiState == WifiManager.WIFI_STATE_ENABLING
     }
-
-    fun setWifiEnabled(cxt: Context, enable: Boolean) {
-        val wifiMgr = cxt.applicationContext.getSystemService(
-            Context.WIFI_SERVICE
-        ) as WifiManager
-        wifiMgr.isWifiEnabled = enable
-    }
 }
diff --git a/baseLib/src/main/java/me/ycdev/android/lib/common/androidx/app/JobScheduler.kt b/baseLib/src/main/java/me/ycdev/android/lib/common/androidx/app/JobScheduler.kt
@@ -2,25 +2,8 @@
 
 package me.ycdev.android.lib.common.androidx.app
 
-import android.app.job.JobInfo
 import android.app.job.JobScheduler
-import android.os.Build.VERSION
-import android.os.Build.VERSION_CODES
-
-fun JobScheduler.getPendingJobCompat(jobId: Int): JobInfo? {
-    if (VERSION.SDK_INT >= VERSION_CODES.N) {
-        return getPendingJob(jobId)
-    } else {
-        val jobInfoList = allPendingJobs
-        for (jobInfo in jobInfoList) {
-            if (jobInfo.id == jobId) {
-                return jobInfo
-            }
-        }
-        return null
-    }
-}
 
 fun JobScheduler.isJobScheduled(jobId: Int): Boolean {
-    return getPendingJobCompat(jobId) != null
+    return getPendingJob(jobId) != null
 }
diff --git a/baseLib/src/main/java/me/ycdev/android/lib/common/apps/AppsLoader.kt b/baseLib/src/main/java/me/ycdev/android/lib/common/apps/AppsLoader.kt
@@ -1,6 +1,5 @@
 package me.ycdev.android.lib.common.apps
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
@@ -11,16 +10,13 @@ import me.ycdev.android.lib.common.utils.MiscUtils
 import me.ycdev.android.lib.common.utils.PackageUtils
 import me.ycdev.android.lib.common.utils.StringUtils
 import java.io.File
-import java.util.ArrayList
-import java.util.HashMap
 
 @Suppress("unused", "DEPRECATION")
 class AppsLoader private constructor(cxt: Context) {
     private val appContext: Context = cxt.applicationContext
     private val pm: PackageManager = cxt.packageManager
     private val myselfPkgName: String = cxt.packageName
 
-    @TargetApi(Build.VERSION_CODES.N)
     fun loadInstalledApps(
         filter: AppsLoadFilter,
         config: AppsLoadConfig,
@@ -132,9 +128,7 @@ class AppsLoader private constructor(cxt: Context) {
         }
 
         item.targetSdkVersion = pkgInfo.applicationInfo.targetSdkVersion
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            item.minSdkVersion = pkgInfo.applicationInfo.minSdkVersion
-        }
+        item.minSdkVersion = pkgInfo.applicationInfo.minSdkVersion
 
         return item
     }
diff --git a/baseLib/src/main/java/me/ycdev/android/lib/common/net/NetworkUtils.kt b/baseLib/src/main/java/me/ycdev/android/lib/common/net/NetworkUtils.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
-import android.os.Build
 import android.telephony.TelephonyManager
 import android.text.TextUtils
 import androidx.annotation.IntDef
@@ -131,12 +130,7 @@ object NetworkUtils {
 
         val tmType: Int
         try {
-            @Suppress("DEPRECATION")
-            tmType = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                tm.dataNetworkType
-            } else {
-                tm.networkType
-            }
+            tmType = tm.dataNetworkType
         } catch (e: Exception) {
             LibLogger.w(TAG, "failed to get telephony network type", e)
             return NETWORK_TYPE_NONE
diff --git a/baseLib/src/main/java/me/ycdev/android/lib/common/utils/PackageUtils.kt b/baseLib/src/main/java/me/ycdev/android/lib/common/utils/PackageUtils.kt
@@ -2,14 +2,12 @@
 
 package me.ycdev.android.lib.common.utils
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.content.pm.ServiceInfo
-import android.os.Build
 import android.view.inputmethod.InputMethodManager
 import java.util.ArrayList
 
@@ -87,7 +85,6 @@ object PackageUtils {
         return pkgNames
     }
 
-    @TargetApi(Build.VERSION_CODES.N)
     fun getAllReceivers(
         cxt: Context,
         pkgName: String,
@@ -121,7 +118,6 @@ object PackageUtils {
         return emptyArray()
     }
 
-    @TargetApi(Build.VERSION_CODES.N)
     fun getAllServices(cxt: Context, pkgName: String, onlyExported: Boolean): Array<ServiceInfo> {
         try {
             val pm = cxt.packageManager
@@ -151,7 +147,6 @@ object PackageUtils {
         return emptyArray()
     }
 
-    @TargetApi(Build.VERSION_CODES.N)
     fun getAllActivities(
         cxt: Context,
         pkgName: String,
diff --git a/build_common.gradle b/build_common.gradle
@@ -1,3 +1,3 @@
 ext {
-    versions.minSdk = 23
+    versions.minSdk = 24
 }

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,4 @@ object SystemSwitchUtils {`
`13`	`13`	`val wifiState = wifiMgr.wifiState`
`14`	`14`	`return wifiState == WifiManager.WIFI_STATE_ENABLED \|\| wifiState == WifiManager.WIFI_STATE_ENABLING`
`15`	`15`	`}`
`16`		`-`
`17`		`- fun setWifiEnabled(cxt: Context, enable: Boolean) {`
`18`		`- val wifiMgr = cxt.applicationContext.getSystemService(`
`19`		`- Context.WIFI_SERVICE`
`20`		`- ) as WifiManager`
`21`		`- wifiMgr.isWifiEnabled = enable`
`22`		`- }`
`23`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`ext {`
`2`		`- versions.minSdk = 23`
	`2`	`+ versions.minSdk = 24`
`3`	`3`	`}`