drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow null filters for foreground dispatch to act as catch all." into gingerbread

Browse Source
This commit is contained in:
Jeff Hamilton
2011-01-23 19:17:22 -08:00
committed by Android (Google) Code Review
parent 42a461570b 9f20cd7ff2
commit e1e70c5761
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/nfc/NfcAdapter.java
View File

@ -26,7 +26,6 @@ import android.content.Context;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.IPackageManager; import android.content.pm.IPackageManager;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.nfc.tech.TagTechnology;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; 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 * 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 * 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. * This method must be called from the main thread.
* *
* @param activity the Activity to dispatch to * @param activity the Activity to dispatch to
* @param intent the PendingIntent to start for the dispatch * @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 * @throws IllegalStateException
*/ */
public void enableForegroundDispatch(Activity activity, PendingIntent intent, public void enableForegroundDispatch(Activity activity, PendingIntent intent,
IntentFilter... filters) { IntentFilter... filters) {
if (activity == null || intent == null || filters == null) { if (activity == null || intent == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
if (!activity.isResumed()) { 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) { public void enableForegroundNdefPush(Activity activity, NdefMessage msg) {
if (activity == null || msg == null) { if (activity == null || msg == null) {