MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Proper synchronization

Browse Source
This commit is contained in:
topjohnwu 2021-02-24 02:50:55 -08:00
parent e613855a4f
commit 60f3d62f00
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/topjohnwu/magisk/core/tasks/MagiskInstaller.kt
View File

@ -43,8 +43,6 @@ import java.security.SecureRandom
import java.util.* import java.util.*
import java.util.zip.ZipFile import java.util.zip.ZipFile
private var haveActiveSession: Boolean = false
abstract class MagiskInstallImpl protected constructor( abstract class MagiskInstallImpl protected constructor(
protected val console: MutableList<String> = NOPList.getInstance(), protected val console: MutableList<String> = NOPList.getInstance(),
private val logs: MutableList<String> = NOPList.getInstance() private val logs: MutableList<String> = NOPList.getInstance()
@ -418,17 +416,21 @@ abstract class MagiskInstallImpl protected constructor(
protected abstract suspend fun operations(): Boolean protected abstract suspend fun operations(): Boolean
open suspend fun exec(): Boolean { open suspend fun exec(): Boolean {
synchronized(haveActiveSession) { synchronized(Companion) {
if (haveActiveSession) if (haveActiveSession)
return false return false
haveActiveSession = true haveActiveSession = true
} }
val result = withContext(Dispatchers.IO) { operations() } val result = withContext(Dispatchers.IO) { operations() }
synchronized(haveActiveSession) { synchronized(Companion) {
haveActiveSession = false haveActiveSession = false
} }
return result return result
} }
companion object {
private var haveActiveSession = false
}
} }
abstract class MagiskInstaller( abstract class MagiskInstaller(