From 04a1f21bfe06bfd4f346fd48a6bc12b756f562c2 Mon Sep 17 00:00:00 2001 From: James Willcox Date: Mon, 20 May 2024 18:11:13 +0000 Subject: Pass package name to `NfcService.setObserveMode()` Bug: 341381728 Test: atest CtsNfcTestCases Change-Id: I0c2376cfa8bb7ae0e231d2efde03e1fa56649b6a --- nfc/java/android/nfc/INfcAdapter.aidl | 2 +- nfc/java/android/nfc/NfcAdapter.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nfc/java/android/nfc/INfcAdapter.aidl b/nfc/java/android/nfc/INfcAdapter.aidl index 7cd7e7ab49a9..7150b54cf7f1 100644 --- a/nfc/java/android/nfc/INfcAdapter.aidl +++ b/nfc/java/android/nfc/INfcAdapter.aidl @@ -91,7 +91,7 @@ interface INfcAdapter boolean enableReaderOption(boolean enable); boolean isObserveModeSupported(); boolean isObserveModeEnabled(); - boolean setObserveMode(boolean enabled); + boolean setObserveMode(boolean enabled, String pkg); @JavaPassthrough(annotation="@android.annotation.RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS)") boolean setWlcEnabled(boolean enable); diff --git a/nfc/java/android/nfc/NfcAdapter.java b/nfc/java/android/nfc/NfcAdapter.java index e43d10422729..22cc8252d017 100644 --- a/nfc/java/android/nfc/NfcAdapter.java +++ b/nfc/java/android/nfc/NfcAdapter.java @@ -1264,8 +1264,12 @@ public final class NfcAdapter { @FlaggedApi(Flags.FLAG_NFC_OBSERVE_MODE) public boolean setObserveModeEnabled(boolean enabled) { + if (mContext == null) { + throw new UnsupportedOperationException("You need a context on NfcAdapter to use the " + + " observe mode APIs"); + } try { - return sService.setObserveMode(enabled); + return sService.setObserveMode(enabled, mContext.getPackageName()); } catch (RemoteException e) { attemptDeadServiceRecovery(e); return false; -- cgit v1.2.3-59-g8ed1b