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

Commit 7016d551 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the NPE problem." into main am: 53b021fa 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3377694



Change-Id: Iabc56a1f58872a321a62c0456d9fd0b72355ccff
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4f8f3009 53b021fa

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(