diff options
| author | Martijn Coenen <maco@google.com> | 2011-10-14 13:00:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-14 13:00:45 -0700 |
| commit | fafc43b349c6b4e8d77ce60f6cac7290cdacdd1a (patch) | |
| tree | 0ef30219d1bbf5c61defc464c58fa69acc7ec7ce /core/java/android/nfc | |
| parent | e04783ccde79730f239d739ad515224245683f22 (diff) | |
| parent | 202b38cb71d123e4ebc8741643e84fa455ecd002 (diff) | |
| download | frameworks_base-fafc43b349c6b4e8d77ce60f6cac7290cdacdd1a.zip frameworks_base-fafc43b349c6b4e8d77ce60f6cac7290cdacdd1a.tar.gz frameworks_base-fafc43b349c6b4e8d77ce60f6cac7290cdacdd1a.tar.bz2 | |
am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
* commit '202b38cb71d123e4ebc8741643e84fa455ecd002':
Remove NfcFragment from activity when no longer sharing.
Diffstat (limited to 'core/java/android/nfc')
| -rw-r--r-- | core/java/android/nfc/NfcActivityManager.java | 1 |
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); } } |