Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '202b38cb71d123e4ebc8741643e84fa455ecd002':
  Remove NfcFragment from activity when no longer sharing.
This commit is contained in:
Martijn Coenen
2011-10-14 13:00:45 -07:00
committed by Android Git Automerger
parent e04783ccde 202b38cb71
commit fafc43b349
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/nfc/NfcActivityManager.java
View File

@@ -162,6 +162,7 @@ public final class NfcActivityManager extends INdefPushCallback.Stub {
synchronized void maybeRemoveState(Activity activity, NfcActivityState state) { synchronized void maybeRemoveState(Activity activity, NfcActivityState state) {
if (state.ndefMessage == null && state.ndefMessageCallback == null && if (state.ndefMessage == null && state.ndefMessageCallback == null &&
state.onNdefPushCompleteCallback == null) { state.onNdefPushCompleteCallback == null) {
NfcFragment.remove(activity);
mNfcState.remove(activity); mNfcState.remove(activity);
} }
} }