From 006cef41c54d9ff9155ba8ef05686caf545f476f Mon Sep 17 00:00:00 2001 From: Patryk Michalik Date: Tue, 15 Jun 2021 16:43:21 +0200 Subject: [PATCH] =?UTF-8?q?Reformat=20root=20access=E2=80=93related=20clas?= =?UTF-8?q?ses?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lawnchair/src/app/lawnchair/root/RootHelper.kt | 1 - lawnchair/src/app/lawnchair/root/RootHelperBackend.java | 2 -- lawnchair/src/app/lawnchair/root/RootHelperManager.kt | 7 ++----- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lawnchair/src/app/lawnchair/root/RootHelper.kt b/lawnchair/src/app/lawnchair/root/RootHelper.kt index e624fbb5bf..4bb75c8b7e 100644 --- a/lawnchair/src/app/lawnchair/root/RootHelper.kt +++ b/lawnchair/src/app/lawnchair/root/RootHelper.kt @@ -5,7 +5,6 @@ import android.os.IBinder import com.topjohnwu.superuser.ipc.RootService class RootHelper : RootService() { - override fun onBind(intent: Intent): IBinder { return RootHelperBackend(this) } diff --git a/lawnchair/src/app/lawnchair/root/RootHelperBackend.java b/lawnchair/src/app/lawnchair/root/RootHelperBackend.java index 60a94d8f9d..8674539739 100644 --- a/lawnchair/src/app/lawnchair/root/RootHelperBackend.java +++ b/lawnchair/src/app/lawnchair/root/RootHelperBackend.java @@ -2,13 +2,11 @@ package app.lawnchair.root; import android.content.Context; import android.os.PowerManager; -import android.os.RemoteException; import android.os.SystemClock; import androidx.core.content.ContextCompat; public class RootHelperBackend extends IRootHelper.Stub { - private final Context mContext; public RootHelperBackend(Context context) { diff --git a/lawnchair/src/app/lawnchair/root/RootHelperManager.kt b/lawnchair/src/app/lawnchair/root/RootHelperManager.kt index 761e1f4baf..4226fbd9c0 100644 --- a/lawnchair/src/app/lawnchair/root/RootHelperManager.kt +++ b/lawnchair/src/app/lawnchair/root/RootHelperManager.kt @@ -14,7 +14,6 @@ import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine class RootHelperManager(private val context: Context) { - private val prefs = PreferenceManager.getInstance(context) private var rootHelper: IRootHelper? = null private val connectionListeners = CopyOnWriteArraySet() @@ -33,11 +32,9 @@ class RootHelperManager(private val context: Context) { @Throws(RootNotAvailableException::class) suspend fun getService(): IRootHelper { prefs.autoLaunchRoot.set(isAvailable) - if (!isAvailable) throw RootNotAvailableException() - if (rootHelper != null) { - return rootHelper!! - } + if (!isAvailable) throw RootNotAvailableException() + if (rootHelper != null) return rootHelper!! val intent = Intent(context, RootHelper::class.java) RootService.bind(intent, connection)