Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b288f993 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android Git Automerger
Browse files

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

* commit '1eca250b':
  Fix disableForegroundNdefPush crash.
parents dd79b4c8 1eca250b
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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();
        }
    }