Skip to content

Guard profile clearing against IPackageManager runtime drift #781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
XiaoTong6666 wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −1
Draft

Guard profile clearing against IPackageManager runtime drift #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion daemon/src/main/kotlin/org/matrix/vector/daemon/ipc/ManagerService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ object ManagerService : ILSPManagerService.Stub() {
override fun restartFor(intent: Intent) {} // No-op matching original

override fun clearApplicationProfileData(packageName: String) {
packageManager?.clearApplicationProfileData(packageName)
packageManager?.clearApplicationProfileDataCompat(packageName)
}

override fun enableStatusNotification() = PreferenceStore.isStatusNotificationEnabled()
Expand Down
29 changes: 29 additions & 0 deletions daemon/src/main/kotlin/org/matrix/vector/daemon/system/SystemExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,35 @@ const val MATCH_ALL_FLAGS =
PackageManager.MATCH_UNINSTALLED_PACKAGES or
MATCH_ANY_USER

private val clearApplicationProfileDataMethod: Method? by lazy {
IPackageManager::class
.java
.methods
.find {
it.name == "clearApplicationProfileData" &&
it.parameterTypes.contentEquals(arrayOf(String::class.java))
}
?.apply { isAccessible = true }
}

/** Android 17 may omit this hidden IPackageManager method from the runtime framework. */
fun IPackageManager.clearApplicationProfileDataCompat(packageName: String): Boolean {
val method = clearApplicationProfileDataMethod
if (method == null) {
Log.w(
TAG,
"Runtime IPackageManager lacks clearApplicationProfileData; skipping profile clear for $packageName")
return false
}

return runCatching {
method.invoke(this, packageName)
true
}
.onFailure { Log.e(TAG, "clearApplicationProfileDataCompat failed", it.cause ?: it) }
.getOrDefault(false)
}

@Throws(Exception::class)
private fun IPackageManager.getPackageInfoCompatThrows(
packageName: String,
Expand Down