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

Commit 53b021fa authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix the NPE problem." into main

parents 296f9a08 83490d44
Loading
Loading
Loading
Loading
+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(