Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardPreferences.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardPreferences.java |
index 5ea5aad94a69479ecec488aa417b1fb076b03548..73755f73ab1cad9c833919ba254d1589b7224e5a 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardPreferences.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardPreferences.java |
@@ -40,6 +40,11 @@ public class AutofillServerCardPreferences |
} |
assert mGUID != null; |
CreditCard card = PersonalDataManager.getInstance().getCreditCard(mGUID); |
+ if (card == null) { |
+ getActivity().finish(); |
+ return; |
+ } |
+ |
assert !card.getIsLocal(); |
Preference cardDescription = findPreference(PREF_SERVER_CARD_DESCRIPTION); |