diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java index 452bf91cadf..efa6041855c 100644 --- a/src/com/android/settings/nfc/AndroidBeam.java +++ b/src/com/android/settings/nfc/AndroidBeam.java @@ -53,6 +53,8 @@ public class AndroidBeam extends InstrumentedFragment public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mNfcAdapter = NfcAdapter.getDefaultAdapter(getActivity()); + if (mNfcAdapter == null) + getActivity().finish(); setHasOptionsMenu(true); } @@ -90,7 +92,6 @@ public class AndroidBeam extends InstrumentedFragment @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - SettingsActivity activity = (SettingsActivity) getActivity(); mOldActivityTitle = activity.getActionBar().getTitle(); diff --git a/src/com/android/settings/nfc/PaymentDefaultDialog.java b/src/com/android/settings/nfc/PaymentDefaultDialog.java index 949f87d8b7d..73b92e7b6ba 100644 --- a/src/com/android/settings/nfc/PaymentDefaultDialog.java +++ b/src/com/android/settings/nfc/PaymentDefaultDialog.java @@ -42,7 +42,11 @@ public final class PaymentDefaultDialog extends AlertActivity implements @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mBackend = new PaymentBackend(this); + try { + mBackend = new PaymentBackend(this); + } catch (NullPointerException e) { + finish(); + } Intent intent = getIntent(); ComponentName component = intent.getParcelableExtra( CardEmulation.EXTRA_SERVICE_COMPONENT);