Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5408)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java

Issue 2805543004: Null-check the dialog delegate in the modal permission dialog dismiss handler. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java b/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java
index d2f5e5a01a55c916d717327bdad0371d874c7b1c..194e8e06a18854d9f80b2c9507b9f46a1abb2320 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/permissions/PermissionDialogController.java
@@ -191,6 +191,11 @@ public class PermissionDialogController implements AndroidPermissionRequester.Re
mDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
+ // For some reason this is ocassionally null. See crbug.com/708562.
+ if (mDialogDelegate == null) {
+ scheduleDisplay();
Timothy Loh 2017/05/10 07:38:37 Was there supposed to be a return here?
dominickn 2017/05/10 08:42:15 Hmmmmmmm.... yes. I think so. Oops.
+ }
+
mDialog = null;
if (mDecision == ACCEPTED) {
// Request Android permissions if necessary. This will call back into either
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698