Merge remote-tracking branch 'origin/QCM6490.LA.3.0_T' into fp5-0324
Change-Id: I896d9bab782c61e545116627b4ea40b91230e321
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 0a340f4..c5e37ed 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -2980,7 +2980,7 @@
// Build a new Tag object to return
try {
Tag newTag = new Tag(tag.getUid(), tag.getTechList(),
- tag.getTechExtras(), tag.getHandle(), this);
+ tag.getTechExtras(), tag.getHandle(), mCookieUpToDate, this);
return newTag;
} catch (Exception e) {
Log.e(TAG, "Tag creation exception.", e);
@@ -3031,12 +3031,6 @@
}
@Override
- public void setTagUpToDate(long cookie) throws RemoteException {
- if (DBG) Log.d(TAG, "Register Tag " + Long.toString(cookie) + " as the latest");
- mCookieUpToDate = cookie;
- }
-
- @Override
public boolean isTagUpToDate(long cookie) throws RemoteException {
if (mCookieUpToDate == cookie) {
if (DBG) Log.d(TAG, "Tag " + Long.toString(cookie) + " is up to date");
@@ -3857,7 +3851,7 @@
extras.putInt(Ndef.EXTRA_NDEF_TYPE, Ndef.TYPE_OTHER);
Tag tag = Tag.createMockTag(new byte[]{0x00},
new int[]{TagTechnology.NDEF},
- new Bundle[]{extras});
+ new Bundle[]{extras}, mCookieUpToDate);
Log.d(TAG, "mock NDEF tag, starting corresponding activity");
Log.d(TAG, tag.toString());
int dispatchStatus = mNfcDispatcher.dispatchTag(tag);
@@ -4602,7 +4596,8 @@
private void dispatchTagEndpoint(TagEndpoint tagEndpoint, ReaderModeParams readerParams) {
try {
Tag tag = new Tag(tagEndpoint.getUid(), tagEndpoint.getTechList(),
- tagEndpoint.getTechExtras(), tagEndpoint.getHandle(), mNfcTagService);
+ tagEndpoint.getTechExtras(), tagEndpoint.getHandle(),
+ mCookieUpToDate, mNfcTagService);
registerTagObject(tagEndpoint);
if (readerParams != null) {
try {