Rework installer package name logic to work below Android 9 and fix session creation below Android 12

Author: zacharee

app/src/main/aidl/dev/zwander/installwithoptions/IShellInterface.aidl

@@ -5,7 +5,7 @@ import dev.zwander.installwithoptions.IOptionsApplier;
 import java.util.List;
 
 interface IShellInterface {
-    void install(in AssetFileDescriptor[] descriptors, in int[] options, boolean splits, IOptionsApplier optionsApplier) = 1;
+    void install(in AssetFileDescriptor[] descriptors, in int[] options, boolean splits, IOptionsApplier optionsApplier, String installerPackageName) = 1;
 
     void destroy() = 16777114;
 }

app/src/main/java/dev/zwander/installwithoptions/MainActivity.kt

@@ -40,6 +40,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -158,7 +159,8 @@ fun MainContent(modifier: Modifier = Modifier) {
                                 )
                             }
                             is MutableOption<*> -> {
-                                when (option.value.value) {
+                                val value by option.value.collectAsState()
+                                when (value) {
                                     is String? -> {
                                         @Suppress("UNCHECKED_CAST")
                                         TextOptionItem(option = option as MutableOption<String>)

app/src/main/java/dev/zwander/installwithoptions/data/MutableOption.kt

@@ -1,5 +1,6 @@
 package dev.zwander.installwithoptions.data
 
+import android.annotation.SuppressLint
 import android.content.pm.PackageInstaller.SessionParams
 import android.os.Build
 import androidx.annotation.Keep
@@ -47,7 +48,8 @@ sealed class MutableOption<T>(
             settings = Settings.settings,
         ),
         operator = {
-            if (!it.isNullOrBlank()) {
+            @SuppressLint("NewApi")
+            if (!it.isNullOrBlank() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
                 setInstallerPackageName(it)
             }
         },

app/src/main/java/dev/zwander/installwithoptions/util/Installer.kt

@@ -38,6 +38,7 @@ import dev.zwander.installwithoptions.IOptionsApplier
 import dev.zwander.installwithoptions.R
 import dev.zwander.installwithoptions.data.DataModel
 import dev.zwander.installwithoptions.data.InstallOption
+import dev.zwander.installwithoptions.data.MutableOption
 import dev.zwander.installwithoptions.data.Settings
 import dev.zwander.installwithoptions.data.getMutableOptions
 import kotlinx.coroutines.Dispatchers
@@ -137,6 +138,7 @@ fun rememberPackageInstaller(files: List<DocumentFile>): Installer {
                     options.map { it.value }.toIntArray(),
                     split,
                     applier,
+                    MutableOption.InstallerPackage.settingsKey.getValue(),
                 )
             }
         } catch (e: Exception) {

app/src/main/java/dev/zwander/installwithoptions/util/InternalInstaller.kt

@@ -10,6 +10,7 @@ import android.content.pm.IPackageInstallerSession
 import android.content.pm.IPackageManager
 import android.content.pm.PackageInstaller
 import android.content.res.AssetFileDescriptor
+import android.os.Build
 import android.os.FileBridge
 import android.os.ParcelFileDescriptor
 import android.os.ServiceManager
@@ -29,12 +30,13 @@ class InternalInstaller(private val context: Context) {
         options: IntArray,
         splits: Boolean,
         applier: IOptionsApplier,
+        installerPackageName: String,
     ) {
         if (splits) {
-            installPackagesInSession(fileDescriptors, options, applier)
+            installPackagesInSession(fileDescriptors, options, applier, installerPackageName)
         } else {
             fileDescriptors.forEach { fd ->
-                installPackagesInSession(arrayOf(fd), options, applier)
+                installPackagesInSession(arrayOf(fd), options, applier, installerPackageName)
             }
         }
     }
@@ -44,6 +46,7 @@ class InternalInstaller(private val context: Context) {
         fileDescriptors: Array<AssetFileDescriptor>,
         options: IntArray,
         applier: IOptionsApplier,
+        installerPackageName: String,
     ) {
         var session: IPackageInstallerSession? = null
 
@@ -54,8 +57,23 @@ class InternalInstaller(private val context: Context) {
                 options.reduceOrNull { acc, i -> acc or i }?.let { flags -> installFlags = flags }
                 applier.applyOptions(this)
             }
-            val sessionId =
-                packageInstaller.createSession(params, "system", "system", UserHandle.myUserId())
+            val sessionId = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                packageInstaller.createSession(params, installerPackageName, installerPackageName, UserHandle.myUserId())
+            } else {
+                packageInstaller::class.java
+                    .getMethod(
+                        "createSession",
+                        PackageInstaller.SessionParams::class.java,
+                        String::class.java,
+                        Int::class.java
+                    )
+                    .invoke(
+                        packageInstaller,
+                        params,
+                        installerPackageName,
+                        UserHandle.myUserId(),
+                    ) as Int
+            }
             session = packageInstaller.openSession(sessionId)
             val statusIntent = PendingIntent.getBroadcast(
                 context, Random.nextInt(),

app/src/main/java/dev/zwander/installwithoptions/util/ShellInterface.kt

@@ -34,12 +34,19 @@ class ShellInterface(context: Context) : IShellInterface.Stub() {
         options: IntArray,
         splits: Boolean,
         applier: IOptionsApplier,
+        installerPackageName: String?,
     ) {
         if (Looper.myLooper() == null) {
             Looper.prepare()
         }
 
-        installer.installPackage(fileDescriptors, options, splits, applier)
+        installer.installPackage(
+            fileDescriptors,
+            options,
+            splits,
+            applier,
+            installerPackageName.takeIf { !it.isNullOrBlank() } ?: "shell",
+        )
     }
 
     override fun destroy() {