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

Workaround bug in AOSP code

Browse Source 
Fix #2983, https://issuetracker.google.com/issues/36984866
This commit is contained in:
topjohnwu 2020-07-20 22:22:57 -07:00
parent 2f02f9a580
commit fc67c0195f
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/topjohnwu/magisk/core/su/SuRequestHandler.kt
View File

@ -68,8 +68,13 @@ abstract class SuRequestHandler(
private suspend fun init(name: String) = withContext(Dispatchers.IO) { private suspend fun init(name: String) = withContext(Dispatchers.IO) {
try { try {
if (Const.Version.atLeastCanary()) { if (Const.Version.atLeastCanary()) {
LocalServerSocket(name).use { val server = LocalServerSocket(name)
socket = async { it.accept() }.timedAwait() ?: throw SocketError() // Do NOT use Closable?.use(block) here as LocalServerSocket does
// not implement Closable on older Android platforms
try {
socket = async { server.accept() }.timedAwait() ?: throw SocketError()
} finally {
server.close()
} }
} else { } else {
socket = LocalSocket() socket = LocalSocket()