Merge "NFC: Reset Tap&pay summary text if default payment is not set" am: e990bf3041

am: 56a8267f59

Change-Id: Idca7ade0068f390289c7c13d1765fead6e0e1d35
This commit is contained in:
Hiroki Yamamoto
2017-06-06 19:28:41 +00:00
committed by android-build-merger

View File

@@ -116,10 +116,11 @@ public class PaymentSettings extends SettingsPreferenceFragment {
PaymentBackend paymentBackend = new PaymentBackend(mContext);
paymentBackend.refresh();
PaymentAppInfo app = paymentBackend.getDefaultApp();
String summary = null;
if (app != null) {
mSummaryLoader.setSummary(this, mContext.getString(R.string.payment_summary,
app.label));
summary = mContext.getString(R.string.payment_summary, app.label);
}
mSummaryLoader.setSummary(this, summary);
}
}
}