for #11364 added a exception list for manufacturers violating strict mode policies on startup (#11407)
for #11364 changed blackList -> exceptionList, added one plus to the list change magic strings into const Valmaster
parent
d14b39a56e
commit
cd26ba9a9c
|
@ -8,6 +8,7 @@ import android.os.Build
|
||||||
import android.os.StrictMode
|
import android.os.StrictMode
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.FragmentManager
|
import androidx.fragment.app.FragmentManager
|
||||||
|
import kotlin.collections.HashSet
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Manages strict mode settings for the application.
|
* Manages strict mode settings for the application.
|
||||||
|
@ -23,7 +24,8 @@ object StrictModeManager {
|
||||||
val threadPolicy = StrictMode.ThreadPolicy.Builder()
|
val threadPolicy = StrictMode.ThreadPolicy.Builder()
|
||||||
.detectAll()
|
.detectAll()
|
||||||
.penaltyLog()
|
.penaltyLog()
|
||||||
if (setPenaltyDialog) {
|
if (setPenaltyDialog &&
|
||||||
|
!strictModeExceptionList.contains(Build.MANUFACTURER)) {
|
||||||
threadPolicy.penaltyDialog()
|
threadPolicy.penaltyDialog()
|
||||||
}
|
}
|
||||||
StrictMode.setThreadPolicy(threadPolicy.build())
|
StrictMode.setThreadPolicy(threadPolicy.build())
|
||||||
|
@ -61,4 +63,19 @@ object StrictModeManager {
|
||||||
}
|
}
|
||||||
}, false)
|
}, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* There are certain manufacturers that have custom font classes for the OS systems.
|
||||||
|
* These classes violates the [StrictMode] policies on startup. As a workaround, we create
|
||||||
|
* an exception list for these manufacturers so that dialogs do not show up on start up.
|
||||||
|
* To add a new manufacturer to the list, log "Build.MANUFACTURER" from the device to get the
|
||||||
|
* exact name of the manufacturer.
|
||||||
|
*/
|
||||||
|
private val strictModeExceptionList = HashSet<String>().also {
|
||||||
|
it.add(MANUFACTURE_HUAWEI)
|
||||||
|
it.add(MANUFACTURE_ONE_PLUS)
|
||||||
|
}
|
||||||
|
|
||||||
|
private const val MANUFACTURE_HUAWEI: String = "HUAWEI"
|
||||||
|
private const val MANUFACTURE_ONE_PLUS: String = "OnePlus"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue