am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0

* commit '202b38cb71d123e4ebc8741643e84fa455ecd002': Remove NfcFragment from activity when no longer sharing.
2011-10-14 13:00:45 -07:00
parent e04783ccde 202b38cb71
commit fafc43b349
1 changed files with 1 additions and 0 deletions
--- 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);
        }
    }