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

Commit 166b308b authored by msnider's avatar msnider
Browse files

Fixing a ClassCast exception with ErrorFragments resulting 

from them expecting to only be called by
UninstallerActivity.

Test: Covered by a gts-test ag/1806256 and manually tested
by calling from com.google.vending (Play Store), available
at http://sponge/581c3cc1-534c-4d0e-834f-0ba4cf17ac68.

Fixes: 35430100
Change-Id: Ic5d0e3832163b2e0599fc264361ed49c9333675d
parent 79f7ecbb

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();

        }