Commit 4de8d667 authored by Mygod's avatar Mygod

Refine code style using OsConstants

parent f2297f92
...@@ -22,6 +22,7 @@ package com.github.shadowsocks.bg ...@@ -22,6 +22,7 @@ package com.github.shadowsocks.bg
import android.system.ErrnoException import android.system.ErrnoException
import android.system.Os import android.system.Os
import android.system.OsConstants
import android.text.TextUtils import android.text.TextUtils
import android.util.Log import android.util.Log
import com.crashlytics.android.Crashlytics import com.crashlytics.android.Crashlytics
...@@ -46,9 +47,9 @@ object Executable { ...@@ -46,9 +47,9 @@ object Executable {
continue continue
}.split(Character.MIN_VALUE, limit = 2).first()) }.split(Character.MIN_VALUE, limit = 2).first())
if (exe.parent == app.applicationInfo.nativeLibraryDir && EXECUTABLES.contains(exe.name)) try { if (exe.parent == app.applicationInfo.nativeLibraryDir && EXECUTABLES.contains(exe.name)) try {
Os.kill(process.name.toInt(), 9) // SIGKILL Os.kill(process.name.toInt(), OsConstants.SIGKILL)
} catch (e: ErrnoException) { } catch (e: ErrnoException) {
if (e.errno != 3) { // ESRCH if (e.errno != OsConstants.ESRCH) {
e.printStackTrace() e.printStackTrace()
Crashlytics.log(Log.WARN, "kill", "SIGKILL ${exe.absolutePath} (${process.name}) failed") Crashlytics.log(Log.WARN, "kill", "SIGKILL ${exe.absolutePath} (${process.name}) failed")
Crashlytics.logException(e) Crashlytics.logException(e)
......
...@@ -24,6 +24,7 @@ import android.os.Build ...@@ -24,6 +24,7 @@ import android.os.Build
import android.os.SystemClock import android.os.SystemClock
import android.system.ErrnoException import android.system.ErrnoException
import android.system.Os import android.system.Os
import android.system.OsConstants
import android.util.Log import android.util.Log
import com.crashlytics.android.Crashlytics import com.crashlytics.android.Crashlytics
import com.github.shadowsocks.Core import com.github.shadowsocks.Core
...@@ -98,9 +99,9 @@ class GuardedProcessPool { ...@@ -98,9 +99,9 @@ class GuardedProcessPool {
if (Build.VERSION.SDK_INT < 24) { if (Build.VERSION.SDK_INT < 24) {
val pid = pid.get(process) as Int val pid = pid.get(process) as Int
try { try {
Os.kill(pid, 15) // SIGTERM Os.kill(pid, OsConstants.SIGTERM)
} catch (e: ErrnoException) { } catch (e: ErrnoException) {
if (e.errno != 3) throw e // ESRCH if (e.errno != OsConstants.ESRCH) throw e
} }
val mutex = exitValueMutex.get(process) as Object val mutex = exitValueMutex.get(process) as Object
synchronized(mutex) { synchronized(mutex) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment