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

Commit 11f34273 authored by Matthew Snider's avatar Matthew Snider Committed by Android (Google) Code Review
Browse files

Merge "Fixing a ClassCast exception with ErrorFragments resulting from them... 

Merge "Fixing a ClassCast exception with ErrorFragments resulting from them expecting to only be called by UninstallerActivity."
parents 9245ee6e 166b308b

src/com/android/packageinstaller/handheld/ErrorDialogFragment.java

+4 −1
Original line number Diff line number Diff line
@@ -46,7 +46,10 @@ public class ErrorDialogFragment extends DialogFragment { 
    public void onDismiss(DialogInterface dialog) {

        super.onDismiss(dialog);

        if (isAdded()) {

            if (getActivity() instanceof UninstallerActivity) {

                ((UninstallerActivity) getActivity()).dispatchAborted();

            }



            getActivity().setResult(Activity.RESULT_FIRST_USER);

            getActivity().finish();

        }

src/com/android/packageinstaller/television/ErrorFragment.java

+4 −1
Original line number Diff line number Diff line
@@ -55,7 +55,10 @@ public class ErrorFragment extends GuidedStepFragment { 
    @Override

    public void onGuidedActionClicked(GuidedAction action) {

        if (isAdded()) {

            if (getActivity() instanceof UninstallerActivity) {

                ((UninstallerActivity) getActivity()).dispatchAborted();

            }



            getActivity().setResult(Activity.RESULT_FIRST_USER);

            getActivity().finish();

        }