Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ec759f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixes Settings app crashing when NfcAdapter is null"

parents 8c8049e2 37efa64d

src/com/android/settings/nfc/AndroidBeam.java

+2 −1
Original line number Diff line number Diff line
@@ -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();

src/com/android/settings/nfc/PaymentDefaultDialog.java

+5 −1
Original line number Diff line number Diff line
@@ -42,7 +42,11 @@ public final class PaymentDefaultDialog extends AlertActivity implements 
    @Override

    protected void onCreate(Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        try {

            mBackend = new PaymentBackend(this);

        } catch (NullPointerException e) {

            finish();

        }

        Intent intent = getIntent();

        ComponentName component = intent.getParcelableExtra(

                CardEmulation.EXTRA_SERVICE_COMPONENT);