fix: Session is dead error on Pixels devices when installing apps (#458)

Author: MarcaDian

app/build.gradle.kts

@@ -62,14 +62,6 @@ dependencies {
     implementation(libs.morphe.patcher)
     implementation(libs.morphe.library)
 
-    // Exclude xmlpull as it's included in Android already
-    configurations.configureEach {
-        exclude(group = "xmlpull", module = "xmlpull")
-        // Ackpine uses android-stubs as compileOnly internally — exclude the transitive
-        // dependency since the project already provides hidden API stubs via hidden-api-stub
-        exclude(group = "ru.solrudev.ackpine", module = "android-stubs")
-    }
-
     implementation(libs.androidx.documentfile)
 
     // Native processes

app/src/main/java/app/morphe/manager/ManagerApplication.kt

@@ -62,7 +62,7 @@ class ManagerApplication : Application() {
             )
         }
 
-        // Enable Ackpine logging so install failures (session-dead, conflict codes, etc.)
+        // Enable Ackpine logging
         Ackpine.enableLogcatLogger()
 
         // App icon loader (Coil)

app/src/main/java/app/morphe/manager/data/room/apps/original/OriginalApk.kt

@@ -3,7 +3,6 @@ package app.morphe.manager.data.room.apps.original
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import java.io.File
 
 @Entity(tableName = "original_apks")
 data class OriginalApk(
@@ -13,6 +12,4 @@ data class OriginalApk(
     @ColumnInfo(name = "file_path") val filePath: String,
     @ColumnInfo(name = "last_used") val lastUsed: Long = System.currentTimeMillis(),
     @ColumnInfo(name = "file_size") val fileSize: Long
-) {
-    fun getFile(): File = File(filePath)
-}
+)

app/src/main/java/app/morphe/manager/di/HttpModule.kt

@@ -16,20 +16,17 @@ import org.koin.android.ext.koin.androidContext
 import org.koin.core.module.dsl.singleOf
 import org.koin.dsl.module
 import java.net.Inet4Address
-import java.net.InetAddress
 
 val httpModule = module {
     fun provideHttpClient(context: Context, json: Json) = HttpClient(OkHttp) {
         engine {
             config {
-                dns(object : Dns {
-                    override fun lookup(hostname: String): List<InetAddress> {
-                        val addresses = Dns.SYSTEM.lookup(hostname)
-                        val ipv4Addresses = addresses.filterIsInstance<Inet4Address>()
-                        // Force IPv4 if available, fallback to IPv6 only if no IPv4 addresses are found
-                        return ipv4Addresses.ifEmpty { addresses }
-                    }
-                })
+                dns { hostname ->
+                    val addresses = Dns.SYSTEM.lookup(hostname)
+                    val ipv4Addresses = addresses.filterIsInstance<Inet4Address>()
+                    // Force IPv4 if available, fallback to IPv6 only if no IPv4 addresses are found
+                    ipv4Addresses.ifEmpty { addresses }
+                }
                 // Force HTTP/1.1 to avoid intermittent HTTP/2 PROTOCOL_ERROR stream resets when
                 // downloading patch bundles from GitHub-backed endpoints.
                 protocols(listOf(Protocol.HTTP_1_1))

app/src/main/java/app/morphe/manager/domain/bundles/PatchBundleSource.kt

@@ -115,13 +115,12 @@ sealed class PatchBundleSource(
                 val host = uri.host?.lowercase(java.util.Locale.US) ?: return null
                 val segments = uri.path?.trim('/')?.split('/')?.filter { it.isNotBlank() } ?: return null
 
-                when {
+                when (host) {
                     // raw.githubusercontent.com/owner/repo/...
-                    host == "raw.githubusercontent.com" && segments.isNotEmpty() -> segments[0]
+                    "raw.githubusercontent.com" if segments.isNotEmpty() -> segments[0]
 
                     // github.com/owner/repo/...
-                    host == "github.com" && segments.isNotEmpty() -> segments[0]
-
+                    "github.com" if segments.isNotEmpty() -> segments[0]
                     else -> null
                 }
             } catch (_: Exception) {

app/src/main/java/app/morphe/manager/domain/installer/AckpineInstaller.kt

@@ -13,8 +13,9 @@ import ru.solrudev.ackpine.installer.InstallFailure
 import ru.solrudev.ackpine.installer.PackageInstaller
 import ru.solrudev.ackpine.installer.parameters.InstallParameters
 import ru.solrudev.ackpine.installer.parameters.InstallerType
-import ru.solrudev.ackpine.session.await
+import ru.solrudev.ackpine.installer.parameters.PackageSource
 import ru.solrudev.ackpine.session.Session
+import ru.solrudev.ackpine.session.await
 import ru.solrudev.ackpine.session.parameters.Confirmation
 import ru.solrudev.ackpine.shizuku.ShizukuPlugin
 import ru.solrudev.ackpine.uninstaller.PackageUninstaller
@@ -42,7 +43,7 @@ class AckpineInstaller(private val app: Application) {
 
     /**
      * Installs an APK using the standard Android PackageInstaller API via Ackpine.
-     * Suspends until the user confirms or cancels the system dialog - no timeout needed.
+     * Suspends until the user confirms or cancels the system dialog.
      *
      * @return null on success, or a typed [InstallFailure] the caller can pattern-match on.
      * @throws InstallCancelledException when the user dismisses the system install dialog.
@@ -55,6 +56,8 @@ class AckpineInstaller(private val app: Application) {
                 .setInstallerType(InstallerType.SESSION_BASED)
                 .setConfirmation(Confirmation.IMMEDIATE)
                 .setName(apkFile.name)
+                // PackageSource.LocalFile disables "restricted settings" enforcement on API 33+
+                .setPackageSource(PackageSource.LocalFile)
                 .build()
         )
         return try {
@@ -103,8 +106,8 @@ class AckpineInstaller(private val app: Application) {
                     Log.i(TAG, "installShizuku succeeded: ${apkFile.name}")
                 }
             }
-        } catch (_: CancellationException) {
-            throw InstallCancelledException()
+        } catch (e: CancellationException) {
+            throw InstallCancelledException().initCause(e)
         } catch (e: Exception) {
             Log.w(TAG, "installShizuku exception: ${e.message}", e)
             throw e
@@ -131,8 +134,8 @@ class AckpineInstaller(private val app: Application) {
                     throw UninstallFailedException(result.failure.message ?: result.failure.javaClass.simpleName)
                 }
             }
-        } catch (_: CancellationException) {
-            throw UninstallCancelledException()
+        } catch (e: CancellationException) {
+            throw UninstallCancelledException().initCause(e)
         }
     }
 

app/src/main/java/app/morphe/manager/patcher/runtime/ProcessRuntime.kt

@@ -40,10 +40,9 @@ import kotlin.math.max
 const val PROCESS_RUNTIME_MEMORY_MINIMUM = 512
 const val PROCESS_RUNTIME_MEMORY_MAX_LIMIT = 1280
 const val PROCESS_RUNTIME_MEMORY_MAX_LIMIT_INITIALIZATION = 1024
-private const val PROCESS_RUNTIME_MEMORY_DEFAULT = 640
 private const val PROCESS_RUNTIME_MEMORY_DEFAULT_MINIMUM = 640
 const val PROCESS_RUNTIME_MEMORY_LOW_WARNING = 640
-const val PROCESS_RUNTIME_MEMORY_STEP = 128
+const val PROCESS_RUNTIME_MEMORY_STEP = 64
 
 // Sentinel value indicating the memory limit has never been set
 // triggers adaptive calculation on first use
@@ -117,9 +116,8 @@ class ProcessRuntime(
         skipUnneededSplits: Boolean,
         onMergedApkReady: (suspend (File) -> Unit)?,
     ) = coroutineScope {
-        val minMemoryLimit = 200
+        val minMemoryLimit = 256
         var memoryMB = max(minMemoryLimit, prefs.patcherProcessMemoryLimit.get())
-        var retried = false
 
         while (true) {
             try {
@@ -136,16 +134,6 @@ class ProcessRuntime(
                     onProgress,
                     onMergedApkReady
                 )
-                // Success - update preference and return.
-                if (retried && prefs.patcherProcessMemoryLimit.get() != memoryMB) {
-                    if (memoryMB < PROCESS_RUNTIME_MEMORY_DEFAULT) {
-                        // Don't save a value lower than the expected minimum.
-                        // Instead, allow discovering the actual memory limit again next time.
-                        memoryMB = PROCESS_RUNTIME_MEMORY_DEFAULT
-                    }
-                    Log.i(tag, "Updating process memory limit setting to: $memoryMB")
-                    prefs.patcherProcessMemoryLimit.update(memoryMB)
-                }
 
                 return@coroutineScope
             } catch (e: Exception) {
@@ -156,7 +144,6 @@ class ProcessRuntime(
                 }
 
                 if (isMemoryFailure && !skipMemoryRetry && memoryMB > minMemoryLimit) {
-                    retried = true
                     memoryMB -= PROCESS_RUNTIME_MEMORY_STEP
                     Log.i(tag, "Process memory limit failed, retrying with: $memoryMB")
                     continue

app/src/main/java/app/morphe/manager/ui/model/PatcherStep.kt

@@ -24,10 +24,6 @@ enum class State {
     WAITING, RUNNING, FAILED, COMPLETED
 }
 
-enum class ProgressKey {
-    DOWNLOAD
-}
-
 interface StepProgressProvider {
     val downloadProgress: Pair<Long, Long?>?
 }
@@ -40,6 +36,5 @@ data class Step(
     /** [0, 1] Percentage of the total operation */
     val progressPercentage : Double,
     val state: State = State.WAITING,
-    val message: String? = null,
-    val progressKey: ProgressKey? = null
+    val message: String? = null
 ) : Parcelable

app/src/main/java/app/morphe/manager/ui/screen/home/HomeBottomActionBar.kt

@@ -1,6 +1,5 @@
 package app.morphe.manager.ui.screen.home
 
-import android.annotation.SuppressLint
 import android.view.HapticFeedbackConstants
 import androidx.compose.animation.*
 import androidx.compose.animation.core.FastOutSlowInEasing
@@ -35,14 +34,13 @@ import app.morphe.manager.ui.screen.shared.MorpheDefaults
  */
 @Composable
 fun HomeBottomActionBar(
+    modifier: Modifier = Modifier,
     onBundlesClick: () -> Unit,
     onSettingsClick: () -> Unit,
     isExpertModeEnabled: Boolean = false,
     showSearchButton: Boolean = false,
     searchActive: Boolean = false,
-    onSearchClick: () -> Unit = {},
-    @SuppressLint("ModifierParameter")
-    modifier: Modifier = Modifier
+    onSearchClick: () -> Unit = {}
 ) {
     // Show labels only when there are 2 buttons, buttons are wider so there's space
     val showLabels = !showSearchButton

app/src/main/java/app/morphe/manager/ui/screen/home/HomeDialogs.kt

@@ -11,13 +11,9 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.selection.selectable
 import androidx.compose.foundation.selection.selectableGroup
-import androidx.compose.ui.semantics.Role
-import androidx.compose.ui.semantics.contentDescription
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -26,17 +22,16 @@ import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -57,10 +52,8 @@ import app.morphe.manager.util.RemoteAvatar
 import app.morphe.manager.util.htmlAnnotatedString
 import app.morphe.manager.util.toast
 import app.morphe.patcher.patch.AppTarget
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import java.net.URI
 
 /**
@@ -1192,8 +1185,8 @@ fun WrongPackageDialog(
 
 /**
  * Version list card where each row is tappable.
- * The selected version gets a checkmark; the recommended version is labelled when not selected.
- * Experimental versions are always labelled regardless of selection state.
+ * The selected version gets a checkmark; the recommended version is labeled when not selected.
+ * Experimental versions are always labeled regardless of selection state.
  */
 @Composable
 private fun SelectableVersionListCard(
@@ -1368,14 +1361,13 @@ private fun SelectableVersionListCard(
 
 @Composable
 private fun VersionListCard(
+    modifier: Modifier = Modifier,
     versions: List<String>,
     recommendedIndex: Int = 0,
     isCompatible: Boolean = false,
     showUnpatchedBadge: Boolean = false,
     experimentalVersions: Set<String> = emptySet(),
-    descriptions: Map<String, String> = emptyMap(),
-    @SuppressLint("ModifierParameter")
-    modifier: Modifier = Modifier
+    descriptions: Map<String, String> = emptyMap()
 ) {
     if (versions.isEmpty()) return