Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix API review comments, add remove callback." into nyc-dev

Browse Source
This commit is contained in:
Martijn Coenen
2016-04-28 05:34:03 +00:00
committed by Android (Google) Code Review
parent 1d3c59457c d55def8924
commit d19191d4dc
9 changed files with 109 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@@ -215,6 +215,7 @@ LOCAL_SRC_FILES += \
core/java/android/nfc/INfcCardEmulation.aidl \
core/java/android/nfc/INfcFCardEmulation.aidl \
core/java/android/nfc/INfcUnlockHandler.aidl \
core/java/android/nfc/ITagRemovedCallback.aidl \
core/java/android/os/IBatteryPropertiesListener.aidl \
core/java/android/os/IBatteryPropertiesRegistrar.aidl \
core/java/android/os/ICancellationSignal.aidl \

6
api/current.txt
View File

@@ -25011,6 +25011,7 @@ package android.nfc {
method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);
method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);
method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);
method public boolean invokeBeam(android.app.Activity);
method public boolean isEnabled();
method public boolean isNdefPushEnabled();
@@ -25053,6 +25054,10 @@ package android.nfc {
method public abstract void onNdefPushComplete(android.nfc.NfcEvent);
}
public static abstract interface NfcAdapter.OnTagRemovedListener {
method public abstract void onTagRemoved();
}
public static abstract interface NfcAdapter.ReaderCallback {
method public abstract void onTagDiscovered(android.nfc.Tag);
}
@@ -25069,7 +25074,6 @@ package android.nfc {
public final class Tag implements android.os.Parcelable {
method public int describeContents();
method public boolean done(int);
method public byte[] getId();
method public java.lang.String[] getTechList();
method public void writeToParcel(android.os.Parcel, int);

6
api/system-current.txt
View File

@@ -27447,6 +27447,7 @@ package android.nfc {
method public boolean enableNdefPush();
method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);
method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);
method public boolean invokeBeam(android.app.Activity);
method public boolean isEnabled();
method public boolean isNdefPushEnabled();
@@ -27496,6 +27497,10 @@ package android.nfc {
method public abstract void onNdefPushComplete(android.nfc.NfcEvent);
}
public static abstract interface NfcAdapter.OnTagRemovedListener {
method public abstract void onTagRemoved();
}
public static abstract interface NfcAdapter.ReaderCallback {
method public abstract void onTagDiscovered(android.nfc.Tag);
}
@@ -27512,7 +27517,6 @@ package android.nfc {
public final class Tag implements android.os.Parcelable {
method public int describeContents();
method public boolean done(int);
method public byte[] getId();
method public java.lang.String[] getTechList();
method public void writeToParcel(android.os.Parcel, int);

6
api/test-current.txt
View File

@@ -25079,6 +25079,7 @@ package android.nfc {
method public deprecated void enableForegroundNdefPush(android.app.Activity, android.nfc.NdefMessage);
method public void enableReaderMode(android.app.Activity, android.nfc.NfcAdapter.ReaderCallback, int, android.os.Bundle);
method public static android.nfc.NfcAdapter getDefaultAdapter(android.content.Context);
method public boolean ignore(android.nfc.Tag, int, android.nfc.NfcAdapter.OnTagRemovedListener, android.os.Handler);
method public boolean invokeBeam(android.app.Activity);
method public boolean isEnabled();
method public boolean isNdefPushEnabled();
@@ -25121,6 +25122,10 @@ package android.nfc {
method public abstract void onNdefPushComplete(android.nfc.NfcEvent);
}
public static abstract interface NfcAdapter.OnTagRemovedListener {
method public abstract void onTagRemoved();
}
public static abstract interface NfcAdapter.ReaderCallback {
method public abstract void onTagDiscovered(android.nfc.Tag);
}
@@ -25137,7 +25142,6 @@ package android.nfc {
public final class Tag implements android.os.Parcelable {
method public int describeContents();
method public boolean done(int);
method public byte[] getId();
method public java.lang.String[] getTechList();
method public void writeToParcel(android.os.Parcel, int);

3
core/java/android/nfc/INfcAdapter.aidl
View File

@@ -28,6 +28,7 @@ import android.nfc.INfcTag;
import android.nfc.INfcCardEmulation;
import android.nfc.INfcFCardEmulation;
import android.nfc.INfcUnlockHandler;
import android.nfc.ITagRemovedCallback;
import android.os.Bundle;
/**
@@ -55,6 +56,8 @@ interface INfcAdapter
oneway void invokeBeam();
oneway void invokeBeamInternal(in BeamShareData shareData);
boolean ignore(int nativeHandle, int debounceMs, ITagRemovedCallback callback);
void dispatch(in Tag tag);
void setReaderMode (IBinder b, IAppCallback callback, int flags, in Bundle extras);

1
core/java/android/nfc/INfcTag.aidl
View File

@@ -31,7 +31,6 @@ interface INfcTag
boolean isNdef(int nativeHandle);
boolean isPresent(int nativeHandle);
TransceiveResult transceive(int nativeHandle, in byte[] data, boolean raw);
boolean done(int nativeHandle, int debounceMs);
NdefMessage ndefRead(int nativeHandle);
int ndefWrite(int nativeHandle, in NdefMessage msg);

8
core/java/android/nfc/ITagRemovedCallback.aidl Normal file
View File

@@ -0,0 +1,8 @@
package android.nfc;
/**
* @hide
*/
oneway interface ITagRemovedCallback {
void onTagRemoved();
}

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

@@ -35,11 +35,14 @@ import android.nfc.tech.Ndef;
import android.nfc.tech.NfcA;
import android.nfc.tech.NfcF;
import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.Log;
import java.io.IOException;
/**
* Represents the local NFC adapter.
* <p>
@@ -315,6 +318,8 @@ public final class NfcAdapter {
final HashMap<NfcUnlockHandler, INfcUnlockHandler> mNfcUnlockHandlers;
final Object mLock;
ITagRemovedCallback mTagRemovedListener; // protected by mLock
/**
* A callback to be invoked when the system finds a tag while the foreground activity is
* operating in reader mode.
@@ -385,6 +390,13 @@ public final class NfcAdapter {
public Uri[] createBeamUris(NfcEvent event);
}
/**
* A callback that is invoked when a tag is removed from the field.
*/
public interface OnTagRemovedListener {
void onTagRemoved();
}
/**
* A callback to be invoked when an application has registered as a
* handler to unlock the device given an NFC tag at the lockscreen.
@@ -541,6 +553,7 @@ public final class NfcAdapter {
mContext = context;
mNfcActivityManager = new NfcActivityManager(this);
mNfcUnlockHandlers = new HashMap<NfcUnlockHandler, INfcUnlockHandler>();
mTagRemovedListener = null;
mLock = new Object();
}
@@ -1493,6 +1506,75 @@ public final class NfcAdapter {
}
}
/**
* Signals that you are no longer interested in communicating with an NFC tag
* for as long as it remains in range.
*
* All future attempted communication to this tag will fail with {@link IOException}.
* The NFC controller will be put in a low-power polling mode, allowing the device
* to save power in cases where it's "attached" to a tag all the time (e.g. a tag in
* car dock).
*
* Additionally the debounceMs parameter allows you to specify for how long the tag needs
* to have gone out of range, before it will be dispatched again.
*
* Note: the NFC controller typically polls at a pretty slow interval (100 - 500 ms).
* This means that if the tag repeatedly goes in and out of range (for example, in
* case of a flaky connection), and the controller happens to poll every time the
* tag is out of range, it *will* re-dispatch the tag after debounceMs, despite the tag
* having been "in range" during the interval.
*
* Note 2: if a tag with another UID is detected after this API is called, its effect
* will be cancelled; if this tag shows up before the amount of time specified in
* debounceMs, it will be dispatched again.
*
* Note 3: some tags have a random UID, in which case this API won't work reliably.
*
* @param tag the {@link android.nfc.Tag Tag} to ignore.
* @param debounceMs minimum amount of time the tag needs to be out of range before being
* dispatched again.
* @param tagRemovedListener listener to be called when the tag is removed from the field.
* Note that this will only be called if the tag has been out of range
* for at least debounceMs, or if another tag came into range before
* debounceMs. May be null in case you don't want a callback.
* @param handler the {@link android.os.Handler Handler} that will be used for delivering
* the callback. if the handler is null, then the thread used for delivering
* the callback is unspecified.
* @return false if the tag couldn't be found (or has already gone out of range), true otherwise
*/
public boolean ignore(final Tag tag, int debounceMs,
final OnTagRemovedListener tagRemovedListener, final Handler handler) {
ITagRemovedCallback.Stub iListener = null;
if (tagRemovedListener != null) {
iListener = new ITagRemovedCallback.Stub() {
@Override
public void onTagRemoved() throws RemoteException {
if (handler != null) {
handler.post(new Runnable() {
@Override
public void run() {
tagRemovedListener.onTagRemoved();
}
});
} else {
tagRemovedListener.onTagRemoved();
}
synchronized (mLock) {
mTagRemovedListener = null;
}
}
};
}
synchronized (mLock) {
mTagRemovedListener = iListener;
}
try {
return sService.ignore(tag.getServiceHandle(), debounceMs, iListener);
} catch (RemoteException e) {
return false;
}
}
/**
* Inject a mock NFC tag.<p>
* Used for testing purposes.

36
core/java/android/nfc/Tag.java
View File

@@ -214,42 +214,6 @@ public final class Tag implements Parcelable {
return techIntList;
}
/**
* Signals that you are no longer interested in communicating with this tag
* for as long as it remains in range.
*
* All future attempted communication to this tag will fail with {@link IOException}.
* The NFC controller will be put in a low-power polling mode, allowing the device
* to save power in cases where it's "attached" to a tag all the time (eg a tag in
* car dock).
*
* Additionally the debounceMs parameter allows you to specify for how long the tag needs
* to have gone out of range, before it will be dispatched again.
*
* Note: the NFC controller typically polls at a pretty slow interval (100 - 500 ms).
* This means that if the tag repeatedly goes in and out of range (for example, in
* case of a flaky connection), and the controller happens to poll every time the
* tag is out of range, it *will* re-dispatch the tag after debounceMs, despite the tag
* having been "in range" during the interval.
*
* Note 2: if a tag with another UID is detected after this API is called, its effect
* will be cancelled; if this tag shows up before the amount of time specified in
* debounceMs, it will be dispatched again.
*
* Note 3: some tags have a random UID, in which case this API won't work.
*
* @param debounceMs minimum amount of time the tag needs to be out of range before being
* dispatched again.
* @return false if the Tag couldn't be found (or has gone out of range), true otherwise
*/
public boolean done(int debounceMs) {
try {
return mTagService.done(getServiceHandle(), debounceMs);
} catch (RemoteException e) {
return false;
}
}
private static HashMap<String, Integer> getTechStringToCodeMap() {
HashMap<String, Integer> techStringToCodeMap = new HashMap<String, Integer>();