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

Commit a7d1f5c5 authored by Robin Lee's avatar Robin Lee
Browse files

TV: Fix launch for "Deny Anyway" permission dialog 

Previously the dialog was not showing up at all and the parent was
dismissing itself. We can't use getChildFragmentManager() for this and
need to set the parent view as a target fragment instead.

We exit the permission setting sub-screen once we get the state change
callback, either from feedback loop on the model or indirectly from the
dialog changing something.

If there is no change, we stay on the same screen.

Test: atest android.permission3.cts
Test: atest android.permission2.cts
Test: atest android.permission.cts
Test: atest android.os.cts.AutoRevokeTest
Bug: 155356284
Change-Id: I3af8f2a6eb4cd85447684c5930249c93a5c84d1e
parent 93a17850

src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java

+4 −4
Original line number Diff line number Diff line
@@ -386,7 +386,6 @@ public class AppPermissionFragment extends SettingsWithHeader 
                .putExtra(EXTRA_RESULT_PERMISSION_INTERACTED, mPermGroupName)

                .putExtra(EXTRA_RESULT_PERMISSION_RESULT, result);

        getActivity().setResult(Activity.RESULT_OK, intent);

        getActivity().onBackPressed();

    }



    /**
@@ -418,7 +417,8 @@ public class AppPermissionFragment extends SettingsWithHeader 
        ConfirmDialog defaultDenyDialog = new ConfirmDialog();

        defaultDenyDialog.setCancelable(true);

        defaultDenyDialog.setArguments(args);

        defaultDenyDialog.show(getChildFragmentManager().beginTransaction(),

        defaultDenyDialog.setTargetFragment(this, 0);

        defaultDenyDialog.show(getFragmentManager(),

                ConfirmDialog.class.getName());

    }
@@ -440,7 +440,7 @@ public class AppPermissionFragment extends SettingsWithHeader 


        @Override

        public Dialog onCreateDialog(Bundle savedInstanceState) {

            AppPermissionFragment fragment = (AppPermissionFragment) getParentFragment();

            AppPermissionFragment fragment = (AppPermissionFragment) getTargetFragment();

            boolean isGrantFileAccess = getArguments().getSerializable(CHANGE_REQUEST)

                    == ChangeRequest.GRANT_All_FILE_ACCESS;

            int positiveButtonStringResId = R.string.grant_dialog_button_deny_anyway;
@@ -469,7 +469,7 @@ public class AppPermissionFragment extends SettingsWithHeader 


        @Override

        public void onCancel(DialogInterface dialog) {

            AppPermissionFragment fragment = (AppPermissionFragment) getParentFragment();

            AppPermissionFragment fragment = (AppPermissionFragment) getTargetFragment();

            fragment.setRadioButtonsState(fragment.mViewModel.getButtonStateLiveData().getValue());

        }

    }