WeiguangTWK
/
GKMSPatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

fix: packageInstaller userId (#280) 

Package installer now install patched app in current user instead of
main user
This commit is contained in:
Js0n 2023-12-12 00:35:20 +08:00 committed by GitHub
parent 4bf1371155
commit 2243d010b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manager/src/main/java/org/lsposed/lspatch/util/ShizukuApi.kt
View File

@ -5,6 +5,7 @@ import android.content.pm.*
import android.os.Build import android.os.Build
import android.os.IBinder import android.os.IBinder
import android.os.IInterface import android.os.IInterface
import android.os.Process
import android.os.SystemProperties import android.os.SystemProperties
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.mutableStateOf
@ -28,10 +29,11 @@ object ShizukuApi {
} }
private val packageInstaller: PackageInstaller by lazy { private val packageInstaller: PackageInstaller by lazy {
val userId = Process.myUserHandle().hashCode()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
Refine.unsafeCast(PackageInstallerHidden(iPackageInstaller, "com.android.shell", null, 0)) Refine.unsafeCast(PackageInstallerHidden(iPackageInstaller, "com.android.shell", null, userId))
} else { } else {
Refine.unsafeCast(PackageInstallerHidden(iPackageInstaller, "com.android.shell", 0)) Refine.unsafeCast(PackageInstallerHidden(iPackageInstaller, "com.android.shell", userId))
} }
} }
@ -56,11 +58,11 @@ object ShizukuApi {
} }
fun isPackageInstalledWithoutPatch(packageName: String): Boolean { fun isPackageInstalledWithoutPatch(packageName: String): Boolean {
// TODO: userId val userId = Process.myUserHandle().hashCode()
val app = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { val app = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
iPackageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA.toLong(), 0) iPackageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA.toLong(), userId)
} else { } else {
iPackageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA, 0) iPackageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA, userId)
} }
return (app != null) && (app.metaData?.containsKey("lspatch") != true) return (app != null) && (app.metaData?.containsKey("lspatch") != true)
} }