diff options
| author | Martijn Coenen <maco@google.com> | 2011-10-31 22:54:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-31 22:54:43 +0000 |
| commit | b288f99334348a21ffb465b37a4522998b452410 (patch) | |
| tree | 5f3086b93ca836bcd18ccc5e0db20b988f54fc53 /core/java/android/nfc | |
| parent | dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1 (diff) | |
| parent | 1eca250b9dad45893fead128539f112cbc513496 (diff) | |
| download | frameworks_base-b288f99334348a21ffb465b37a4522998b452410.zip frameworks_base-b288f99334348a21ffb465b37a4522998b452410.tar.gz frameworks_base-b288f99334348a21ffb465b37a4522998b452410.tar.bz2 | |
am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
* commit '1eca250b9dad45893fead128539f112cbc513496':
Fix disableForegroundNdefPush crash.
Diffstat (limited to 'core/java/android/nfc')
| -rw-r--r-- | core/java/android/nfc/NfcFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/nfc/NfcFragment.java b/core/java/android/nfc/NfcFragment.java index 17278dc..d6b15ad 100644 --- a/core/java/android/nfc/NfcFragment.java +++ b/core/java/android/nfc/NfcFragment.java @@ -48,7 +48,10 @@ public final class NfcFragment extends Fragment { FragmentManager manager = activity.getFragmentManager(); Fragment fragment = manager.findFragmentByTag(FRAGMENT_TAG); if (fragment != null) { - manager.beginTransaction().remove(fragment).commit(); + // We allow state loss at this point, because the state is only + // lost when activity is being paused *AND* subsequently destroyed. + // In that case, the app will setup foreground dispatch again anyway. + manager.beginTransaction().remove(fragment).commitAllowingStateLoss(); } } |