summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2011-10-14 12:57:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-14 12:57:34 -0700
commit202b38cb71d123e4ebc8741643e84fa455ecd002 (patch)
tree84bc385274cf18a810ff7b3adca514ff85cdeadb /core
parent615858a8ebb12b3541fd709e6e965ac814880261 (diff)
parent2ec83936a1c05d3286cb5656566e905a50d871de (diff)
downloadframeworks_base-202b38cb71d123e4ebc8741643e84fa455ecd002.zip
frameworks_base-202b38cb71d123e4ebc8741643e84fa455ecd002.tar.gz
frameworks_base-202b38cb71d123e4ebc8741643e84fa455ecd002.tar.bz2
Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
Diffstat (limited to 'core')
-rw-r--r--core/java/android/nfc/NfcActivityManager.java1
1 files changed, 1 insertions, 0 deletions
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);
}
}