Skip to content

fix(playintegrity): complete unsupported requestAndShowDialog requests #3829

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
ysard wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix(playintegrity): complete unsupported requestAndShowDialog requests #3829

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d1c4d8
fix(vending): align IRequestDialogCallback transaction id with Play Core
jonathanklee Aug 19, 2026
e02246a
fix(playintegrity): requestAndShowDialog() hanging clients indefinitely
ysard Sep 23, 2026
905902c
Merge branch 'master' into ysard-fix-requestAndShowDialog-hanging-cli…
mar-v-in Sep 24, 2026
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
31 changes: 29 additions & 2 deletions vending-app/src/main/kotlin/com/google/android/finsky/integrityservice/IntegrityService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import android.content.Intent
import android.os.Bundle
import android.os.IBinder
import android.os.SystemClock
import android.os.RemoteException
import android.text.TextUtils
import android.util.Base64
import android.util.Log
Expand Down Expand Up @@ -90,12 +91,38 @@ private class IntegrityServiceImpl(private val context: Context, override val li
private var integrityData: PlayIntegrityData? = null

override fun requestDialog(bundle: Bundle, callback: IRequestDialogCallback) {
Log.d(TAG, "Method (requestDialog) called but not implemented ")
requestAndShowDialog(bundle, callback)
}

override fun requestAndShowDialog(bundle: Bundle?, callback: IRequestDialogCallback?) {
Log.d(TAG, "Not yet implemented: requestAndShowDialog")
Log.d(TAG, "requestAndShowDialog(bundle=$bundle)")

if (callback == null) {
Log.e(TAG, "requestAndShowDialog: null callback")
return
}

if (callback.asBinder()?.isBinderAlive == false) {
Log.w(TAG, "requestAndShowDialog: callback binder is dead")
return
}

try {
/*
* Play Integrity remediation dialogs are not implemented yet.
*
* Returning an empty Bundle makes Play Core report
* DIALOG_UNAVAILABLE instead of leaving the request pending forever.
*
* A proper remediation implementation should return a Bundle
* containing "dialog.intent".
*/
Log.d(TAG, "requestAndShowDialog: Play Integrity remediation dialogs are not implemented yet")

callback.onRequestDialog(Bundle())
} catch (e: RemoteException) {
Log.e(TAG, "requestAndShowDialog: callback failed", e)
}
}

override fun requestIntegrityToken(request: Bundle, callback: IIntegrityServiceCallback) {
Expand Down
Loading