PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protect against crash when no NfcAdapter is around

Browse Source 
Bug: 26155716
Change-Id: I9e10831ca068263b40fcf06bf83ce341d73e96d2
This commit is contained in:
Jason Monk
2015-12-16 14:26:18 -05:00
parent c685853bb8
commit 77d57d07a9
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/nfc/PaymentSettings.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.nfc;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.nfc.NfcAdapter;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceManager;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
@@ -111,7 +112,7 @@ public class PaymentSettings extends SettingsPreferenceFragment {
@Override @Override
public void setListening(boolean listening) { public void setListening(boolean listening) {
if (listening) { if (listening && NfcAdapter.getDefaultAdapter(mContext) != null) {
PaymentBackend paymentBackend = new PaymentBackend(mContext); PaymentBackend paymentBackend = new PaymentBackend(mContext);
paymentBackend.refresh(); paymentBackend.refresh();
PaymentAppInfo app = paymentBackend.getDefaultApp(); PaymentAppInfo app = paymentBackend.getDefaultApp();