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

Commit 2eb32b00 authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Prevent orphaned fragment on the settings stack." into ics-mr1

parents 179b3286 5ba0a029
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.app.Fragment;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.app.LoaderManager.LoaderCallbacks;
import android.content.ContentResolver;
@@ -518,6 +519,15 @@ public class DataUsageSummary extends Fragment {
        mUidDetailProvider = null;
    }

    @Override
    public void onDestroy() {
        if (this.isRemoving()) {
            getFragmentManager()
                    .popBackStack(TAG_APP_DETAILS, FragmentManager.POP_BACK_STACK_INCLUSIVE);
        }
        super.onDestroy();
    }

    /**
     * Listener to setup {@link LayoutTransition} after first layout pass.
     */
@@ -1502,7 +1512,6 @@ public class DataUsageSummary extends Fragment {
            final AppDetailsFragment fragment = new AppDetailsFragment();
            fragment.setArguments(args);
            fragment.setTargetFragment(parent, 0);

            final FragmentTransaction ft = parent.getFragmentManager().beginTransaction();
            ft.add(fragment, TAG_APP_DETAILS);
            ft.addToBackStack(TAG_APP_DETAILS);