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

Commit 83490d44 authored by lijilou's avatar lijilou Committed by Jilou li
Browse files

Fix the NPE problem. 

getExtras method may be return null when don not put extra.

Bug: 381181574
Flag: EXEMPT bugfix
Change-Id: I2ff672a098d4bdd453377aa1424598eaf33220c2
parent 1adb0dbc

core/java/com/android/internal/app/NfcResolverActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ public class NfcResolverActivity extends ResolverActivity { 
    @Override

    @SuppressWarnings("MissingSuperCall")  // Called indirectly via `super_onCreate()`.

    protected void onCreate(Bundle savedInstanceState) {

        if (!enableNfcMainline()) {

        Intent intent = getIntent();

        if (!enableNfcMainline() || intent.getExtras() == null) {

            super_onCreate(savedInstanceState);

            finish();

            return;

        }



        Intent intent = getIntent();

        Intent target = intent.getParcelableExtra(Intent.EXTRA_INTENT, Intent.class);

        ArrayList<ResolveInfo> rList =

                intent.getParcelableArrayListExtra(