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

am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0

Browse Source 
* commit '1eca250b9dad45893fead128539f112cbc513496':
  Fix disableForegroundNdefPush crash.
This commit is contained in:
Martijn Coenen
2011-10-31 22:54:43 +00:00
committed by Android Git Automerger
parent dd79b4c85a 1eca250b9d
commit b288f99334
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();
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();
}
}