From 23c09eb655ed779b08b8d1e4542a6bd60c83ffba Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 9 Jan 2018 15:19:50 +0100
Subject: RootShell: hoist out synchronization

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 .../java/com/wireguard/android/util/RootShell.java     | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'app/src/main/java/com/wireguard')

diff --git a/app/src/main/java/com/wireguard/android/util/RootShell.java b/app/src/main/java/com/wireguard/android/util/RootShell.java
index 910fa7ae..f5eb440f 100644
--- a/app/src/main/java/com/wireguard/android/util/RootShell.java
+++ b/app/src/main/java/com/wireguard/android/util/RootShell.java
@@ -57,13 +57,11 @@ public class RootShell {
         return false;
     }
 
-    public boolean isRunning() {
+    public synchronized boolean isRunning() {
         try {
             // Throws an exception if the process hasn't finished yet.
-            synchronized (this) {
-                if (process != null)
-                    process.exitValue();
-            }
+            if (process != null)
+                process.exitValue();
         } catch (final IllegalThreadStateException ignored) {
             // The existing process is still running.
             return true;
@@ -149,12 +147,10 @@ public class RootShell {
         }
     }
 
-    public void stop() throws IOException {
-        synchronized (this) {
-            if (process != null) {
-                process.destroy();
-                process = null;
-            }
+    public synchronized void stop() throws IOException {
+        if (process != null) {
+            process.destroy();
+            process = null;
         }
     }
 
-- 
cgit v1.2.3