diff options
author | Jeff Hamilton <jham@android.com> | 2011-01-23 12:14:42 -0600 |
---|---|---|
committer | Jeff Hamilton <jham@android.com> | 2011-01-23 12:15:28 -0600 |
commit | 9f20cd7ff26548e98d7b8412807720c7b340133d (patch) | |
tree | 8a060706e0eabe24ac7e3285e87c79cea48d4050 /core | |
parent | 1c9761e30d6eccfe104928cdc961ed1d3a5e2f6b (diff) | |
download | frameworks_base-9f20cd7ff26548e98d7b8412807720c7b340133d.zip frameworks_base-9f20cd7ff26548e98d7b8412807720c7b340133d.tar.gz frameworks_base-9f20cd7ff26548e98d7b8412807720c7b340133d.tar.bz2 |
Allow null filters for foreground dispatch to act as catch all.
Change-Id: Idf3d2e344a6e87035ccb5b533ed9e81fec596132
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/nfc/NfcAdapter.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index b1623a5..f38bed9 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -26,7 +26,6 @@ import android.content.Context; import android.content.IntentFilter; import android.content.pm.IPackageManager; import android.content.pm.PackageManager; -import android.nfc.tech.TagTechnology; import android.os.IBinder; import android.os.RemoteException; import android.os.ServiceManager; @@ -416,18 +415,19 @@ public final class NfcAdapter { /** * Enables foreground dispatching to the given Activity. This will force all NFC Intents that * match the given filters to be delivered to the activity bypassing the standard dispatch - * mechanism. + * mechanism. If no IntentFilters are given all the PendingIntent will be invoked for every + * dispatch Intent. * * This method must be called from the main thread. * * @param activity the Activity to dispatch to * @param intent the PendingIntent to start for the dispatch - * @param filters the IntentFilters to override dispatching for + * @param filters the IntentFilters to override dispatching for, or null to always dispatch * @throws IllegalStateException */ public void enableForegroundDispatch(Activity activity, PendingIntent intent, IntentFilter... filters) { - if (activity == null || intent == null || filters == null) { + if (activity == null || intent == null) { throw new NullPointerException(); } if (!activity.isResumed()) { @@ -478,7 +478,13 @@ public final class NfcAdapter { } /** - * Enable NDEF messages push while this Activity is in the foreground. + * Enable NDEF message push over P2P while this Activity is in the foreground. For this to + * function properly the other NFC device being scanned must support the "com.android.npp" + * NDEF push protocol. + * + * <p><em>NOTE</em> While foreground NDEF push is active standard tag dispatch is disabled. + * Only the foreground activity may receive tag discovered dispatches via + * {@link #enableForegroundDispatch}. */ public void enableForegroundNdefPush(Activity activity, NdefMessage msg) { if (activity == null || msg == null) { |