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

Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE)." into ics-mr1

Browse Source
This commit is contained in:
Martijn Coenen
2011-11-10 13:48:02 -08:00
committed by Android (Google) Code Review
parent 41ffab86d9 0946fe5be3
commit c5f3fd6ef1
1 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -767,6 +767,61 @@ public final class NfcAdapter {
mNfcActivityManager.setOnNdefPushCompleteCallback(activity, null);
}
/**
* TODO: Remove this once pre-built apk's (Maps, Youtube etc) are updated
* @deprecated use {@link CreateNdefMessageCallback} or {@link OnNdefPushCompleteCallback}
* @hide
*/
@Deprecated
public interface NdefPushCallback {
/**
* @deprecated use {@link CreateNdefMessageCallback} instead
*/
@Deprecated
NdefMessage createMessage();
/**
* @deprecated use{@link OnNdefPushCompleteCallback} instead
*/
@Deprecated
void onMessagePushed();
}
/**
* TODO: Remove this
* Converts new callbacks to old callbacks.
*/
static final class LegacyCallbackWrapper implements CreateNdefMessageCallback,
OnNdefPushCompleteCallback {
final NdefPushCallback mLegacyCallback;
LegacyCallbackWrapper(NdefPushCallback legacyCallback) {
mLegacyCallback = legacyCallback;
}
@Override
public void onNdefPushComplete(NfcEvent event) {
mLegacyCallback.onMessagePushed();
}
@Override
public NdefMessage createNdefMessage(NfcEvent event) {
return mLegacyCallback.createMessage();
}
}
/**
* TODO: Remove this once pre-built apk's (Maps, Youtube etc) are updated
* @deprecated use {@link #setNdefPushMessageCallback} instead
* @hide
*/
@Deprecated
public void enableForegroundNdefPush(Activity activity, final NdefPushCallback callback) {
if (activity == null || callback == null) {
throw new NullPointerException();
}
enforceResumed(activity);
LegacyCallbackWrapper callbackWrapper = new LegacyCallbackWrapper(callback);
mNfcActivityManager.setNdefPushMessageCallback(activity, callbackWrapper);
mNfcActivityManager.setOnNdefPushCompleteCallback(activity, callbackWrapper);
}
/**
* Enable NDEF Push feature.
* <p>This API is for the Settings application.