Skip to content

Vending: Fix repeated EMUI install dialog and implement splitDeferred #3543

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

Open
grenadin wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −2
Open

Vending: Fix repeated EMUI install dialog and implement splitDeferred #3543

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
8 changes: 8 additions & 0 deletions vending-app/src/main/kotlin/com/android/vending/installer/Install.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import android.content.pm.PackageInfo
import android.content.pm.PackageInstaller
import android.content.pm.PackageInstaller.SessionParams
import android.content.pm.PackageManager
import android.os.Build
import android.util.Log
import androidx.annotation.RequiresApi
import androidx.core.app.PendingIntentCompat
Expand Down Expand Up @@ -118,6 +119,13 @@ private suspend fun Context.installPackagesInternal(
val key = computeUniqueKey(packageName, componentNames)
params.setAppLabel(key)
params.setInstallLocation(PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY)
// Suppress EMUI (Huawei) InstallDistActivity confirmation dialog for every session.
// Without this flag, EMUI intercepts each PackageInstaller session and shows a
// mandatory user-confirmation dialog — including for Dynamic Feature Module installs.
// USER_ACTION_NOT_REQUIRED requires API 31 (Android 12 / S).
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
params.setRequireUserAction(SessionParams.USER_ACTION_NOT_REQUIRED)
}
try {
@SuppressLint("PrivateApi") val method = SessionParams::class.java.getDeclaredMethod(
"setDontKillApp", Boolean::class.javaPrimitiveType
Expand Down
23 changes: 21 additions & 2 deletions ...-app/src/main/kotlin/com/google/android/finsky/splitinstallservice/SplitInstallService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,27 @@ class SplitInstallServiceImpl(private val installManager: SplitInstallManager, p

override fun splitDeferred(targetPackage: String, splits: List<Bundle>, bundle0: Bundle, callback: ISplitInstallServiceCallback) {
val packageName = PackageUtils.getAndCheckCallingPackage(context, targetPackage)!!
Log.w(TAG, "splitDeferred(${splits.joinToString()}) called for $packageName, but is not implemented")
runCatching { callback.onDeferredInstall(Bundle()) }
Log.d(TAG, "splitDeferred(${splits.joinToString()}) called for $packageName")
// Deferred installs are background pre-fetch requests (e.g. Facebook DFMs like pytorch/papaya).
// If we only ACK without actually installing, the app falls back to calling startInstall()
// for the same modules later — which triggers another PackageInstaller session and, on EMUI,
// another InstallDistActivity confirmation dialog per module.
// Fix: route deferred requests through the same install flow as startInstall().
if (VendingPreferences.isSplitInstallEnabled(context)) {
lifecycleScope.launch {
runCatching {
installManager.splitInstallFlow(packageName, splits)
Log.d(TAG, "splitDeferred install complete for $packageName")
}.onFailure { e ->
Log.w(TAG, "splitDeferred install failed for $packageName: ${e.message}")
}
// Always ACK so the app is not left waiting.
runCatching { callback.onDeferredInstall(Bundle()) }
}
} else {
Log.w(TAG, "splitDeferred rejected for $packageName, service is disabled")
runCatching { callback.onDeferredInstall(Bundle()) }
}
}

override fun getSessionState2(targetPackage: String, sessionId: Int, callback: ISplitInstallServiceCallback) {
Expand Down