commit 202b38cb71d123e4ebc8741643e84fa455ecd002
author Martijn Coenen <maco@google.com> Fri Oct 14 12:57:34 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 14 12:57:34 2011 -0700
tree 84bc385274cf18a810ff7b3adca514ff85cdeadb
parent 615858a8ebb12b3541fd709e6e965ac814880261
parent 2ec83936a1c05d3286cb5656566e905a50d871de

Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0

core/java/android/nfc/NfcActivityManager.java

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 @@
     synchronized void maybeRemoveState(Activity activity, NfcActivityState state) {
         if (state.ndefMessage == null && state.ndefMessageCallback == null &&
                 state.onNdefPushCompleteCallback == null) {
+            NfcFragment.remove(activity);
             mNfcState.remove(activity);
         }
     }