diff options
| author | 2024-05-21 17:11:30 +0000 | |
|---|---|---|
| committer | 2024-05-21 17:11:30 +0000 | |
| commit | 3506385ecbfa4bed2f7338fa6972b47cf7984c0b (patch) | |
| tree | 4291bc1ab8fa19dff6213c49458ceea918065aa2 | |
| parent | 6bc9cc17cc08b9bfa71532e96001db6b5caa8020 (diff) | |
| parent | 04a1f21bfe06bfd4f346fd48a6bc12b756f562c2 (diff) | |
Merge "Pass package name to `NfcService.setObserveMode()`" into main
| -rw-r--r-- | nfc/java/android/nfc/INfcAdapter.aidl | 2 | ||||
| -rw-r--r-- | 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 06098deb8aff..698df28129be 100644 --- a/nfc/java/android/nfc/NfcAdapter.java +++ b/nfc/java/android/nfc/NfcAdapter.java @@ -1268,8 +1268,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; |