drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix disableForegroundNdefPush crash." into ics-mr0

Browse Source
This commit is contained in:
Martijn Coenen
2011-10-31 15:53:08 -07:00
committed by Android (Google) Code Review
parent aeb11b5988 deb0f20c3d
commit 1eca250b9d
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/nfc/NfcFragment.java
View File

@ -48,7 +48,10 @@ public final class NfcFragment extends Fragment {
FragmentManager manager = activity.getFragmentManager(); FragmentManager manager = activity.getFragmentManager();
Fragment fragment = manager.findFragmentByTag(FRAGMENT_TAG); Fragment fragment = manager.findFragmentByTag(FRAGMENT_TAG);
if (fragment != null) { 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();
} }
} }