Fix this overriding again

This commit is contained in:
Mygod
2021-06-01 09:32:14 +08:00
parent a0b52f130f
commit b8df744c89
3 changed files with 6 additions and 6 deletions

View File

@@ -24,7 +24,7 @@ android {
minSdk = 21
if (targetSdk == 31) targetSdkPreview = "S" else this.targetSdk = targetSdk
resourceConfigurations.addAll(arrayOf("it", "ru", "zh-rCN", "zh-rTW"))
versionCode = 270
versionCode = 271
versionName = "2.12.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions.annotationProcessorOptions.arguments.apply {

View File

@@ -9,9 +9,6 @@
<uses-feature
android:name="android.hardware.ethernet"
android:required="false"/>
<uses-feature
android:name="android.software.leanback"
android:required="false"/>
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false"/>
@@ -24,6 +21,9 @@
<uses-feature
android:name="android.hardware.wifi.direct"
android:required="false"/>
<uses-feature
android:name="android.software.leanback"
android:required="false"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

View File

@@ -318,8 +318,8 @@ data class SoftApConfigurationCompat(
bssid?.toCompat()?.addr,
passphrase,
isHiddenSsid,
if (BuildCompat.isAtLeastS()) getChannels(this) as SparseIntArray else SparseIntArray(1).apply {
append(getBand(this) as Int, getChannel(this) as Int)
if (BuildCompat.isAtLeastS()) getChannels(this) as SparseIntArray else SparseIntArray(1).also {
it.append(getBand(this) as Int, getChannel(this) as Int)
},
securityType,
getMaxNumberOfClients(this) as Int,