summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author George Chang <georgekgchang@google.com> 2023-04-12 11:26:22 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-04-12 11:26:22 +0000
commite69cbc5edb16ab0a84222b621dcf248505444d1b (patch)
treeb1e368005c0e02fb37ee6d2d8095526427661b4d
parent41a5a6222c8c15019c6bbe3c65683e0918096977 (diff)
parentf3dbfcfb86b54f40e70b34fd6870fe4c991717f6 (diff)
Merge "Fix warnings from static analysis tool." am: 7464e44197 am: cbd6a61fb4 am: f3dbfcfb86
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2519737 Change-Id: Ic07978195525a5c2ea46ca387593a2875694fe2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/nfc/tech/NdefFormatable.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/nfc/tech/NdefFormatable.java b/core/java/android/nfc/tech/NdefFormatable.java
index f19d30258393..2240fe7f7d3b 100644
--- a/core/java/android/nfc/tech/NdefFormatable.java
+++ b/core/java/android/nfc/tech/NdefFormatable.java
@@ -124,6 +124,9 @@ public final class NdefFormatable extends BasicTagTechnology {
try {
int serviceHandle = mTag.getServiceHandle();
INfcTag tagService = mTag.getTagService();
+ if (tagService == null) {
+ throw new IOException();
+ }
int errorCode = tagService.formatNdef(serviceHandle, MifareClassic.KEY_DEFAULT);
switch (errorCode) {
case ErrorCodes.SUCCESS: