diff options
| author | 2024-12-11 08:27:04 -0800 | |
|---|---|---|
| committer | 2024-12-11 08:27:04 -0800 | |
| commit | 7016d551a52de446aae4d111cb115f5f82adf5b9 (patch) | |
| tree | 7381c9b0ebcfc36bfd33ea00947aee241dd09b07 | |
| parent | 4f8f300998c58d38f2f0a591d90c93920918fd74 (diff) | |
| parent | 53b021fa1b7abca5c4ffc04d6d0e353785ee2856 (diff) | |
Merge "Fix the NPE problem." into main am: 53b021fa1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3377694
Change-Id: Iabc56a1f58872a321a62c0456d9fd0b72355ccff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/com/android/internal/app/NfcResolverActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/NfcResolverActivity.java b/core/java/com/android/internal/app/NfcResolverActivity.java index 78427fe91088..f15dbd65832a 100644 --- a/core/java/com/android/internal/app/NfcResolverActivity.java +++ b/core/java/com/android/internal/app/NfcResolverActivity.java @@ -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( |