From 2ec83936a1c05d3286cb5656566e905a50d871de Mon Sep 17 00:00:00 2001
From: Martijn Coenen <maco@google.com>
Date: Fri, 14 Oct 2011 09:32:09 -0700
Subject: Remove NfcFragment from activity when no longer sharing.

This fixes scenarios where the same activity sets, unsets
and re-sets an NdefMessage and/or callback.

Bug: 5454848
Change-Id: I5ed98047b9cfe90d2f48656d978f2d08bb4bf0cc
---
 core/java/android/nfc/NfcActivityManager.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'core')

diff --git a/core/java/android/nfc/NfcActivityManager.java b/core/java/android/nfc/NfcActivityManager.java
index da878d4..5fe58e9 100644
--- a/core/java/android/nfc/NfcActivityManager.java
+++ b/core/java/android/nfc/NfcActivityManager.java
@@ -162,6 +162,7 @@ public final class NfcActivityManager extends INdefPushCallback.Stub {
     synchronized void maybeRemoveState(Activity activity, NfcActivityState state) {
         if (state.ndefMessage == null && state.ndefMessageCallback == null &&
                 state.onNdefPushCompleteCallback == null) {
+            NfcFragment.remove(activity);
             mNfcState.remove(activity);
         }
     }
-- 
cgit v1.1