| 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 61164ab434b43ec87f4695ee7747a9ce85f940bc..2962b83425031a518a04f65b36791cad79e50ef8 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
|
| @@ -857,13 +857,14 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie
|
| formatter.format(total.amount.value), false /* isPending */));
|
| mUiShoppingCart.setAdditionalContents(
|
| modifier == null ? null : getLineItems(modifier.additionalDisplayItems));
|
| - mUI.updateOrderSummarySection(mUiShoppingCart);
|
| + if (mUI != null) mUI.updateOrderSummarySection(mUiShoppingCart);
|
| }
|
|
|
| /** @return The first modifier that matches the given instrument, or null. */
|
| @Nullable private PaymentDetailsModifier getModifier(@Nullable PaymentInstrument instrument) {
|
| if (mModifiers == null || instrument == null) return null;
|
| - Set<String> methodNames = instrument.getInstrumentMethodNames();
|
| + // Makes a copy to ensure it is modifiable.
|
| + Set<String> methodNames = new HashSet<>(instrument.getInstrumentMethodNames());
|
| methodNames.retainAll(mModifiers.keySet());
|
| return methodNames.isEmpty() ? null : mModifiers.get(methodNames.iterator().next());
|
| }
|
|
|