From ee98ea2caf556e871937fb2948589391a8d7b5a8 Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 4 Nov 2020 07:48:43 +0800 Subject: [PATCH] Suppress CancellationException again --- mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt index da64b776..07f514ae 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt @@ -7,6 +7,7 @@ import android.system.OsConstants import be.mygod.vpnhotspot.root.ReadArp import be.mygod.vpnhotspot.root.RootManager import be.mygod.vpnhotspot.util.parseNumericAddress +import kotlinx.coroutines.CancellationException import kotlinx.coroutines.runBlocking import timber.log.Timber import java.io.File @@ -127,7 +128,7 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: MacAddr }.value.lineSequence().makeArp() } catch (eRoot: Exception) { eRoot.addSuppressed(e) - Timber.w(eRoot) + if (eRoot !is CancellationException) Timber.w(eRoot) } else Timber.w(e) } return arpCache