chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java - Issue 2193293003: Don't crash when closing UI while waiting for apps to respond.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

Issue 2193293003: Don't crash when closing UI while waiting for apps to respond. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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 | chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPaymentAppTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

index 5c595464c448ff709e9b4ef74308a2fd717c3903..c013e69ade1fe3701ea4cc59ee61383b0ec3b9d3 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -825,7 +825,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie

private void disconnectFromClientWithDebugMessage(String debugMessage, int reason) {

Log.d(TAG, debugMessage);

- mClient.onError(reason);

+ if (mClient != null) mClient.onError(reason);

closeClient();

}

@@ -884,6 +884,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie

@Override

public void onInstrumentsReady(PaymentApp app, List<PaymentInstrument> instruments) {

+ if (mClient == null) return;

mPendingApps.remove(app);

// Place the instruments into either "autofill" or "non-autofill" list to be displayed when

« no previous file with comments | « no previous file | chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestPaymentAppTest.java » ('j') | no next file with comments »