summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Lee <rgl@google.com>2022-08-04 11:31:37 +0000
committerRobin Lee <rgl@google.com>2022-12-14 08:15:41 +0000
commitbf55886290b5ec597bcf1517b98a657e4820783a (patch)
tree186bde38893cfe6f99e30731c6ebc518288ab1ef
parentdf4ed56a22c785eba952fd5d9ca45aaff44be54b (diff)
downloadPermission-bf55886290b5ec597bcf1517b98a657e4820783a.tar.gz
Swap pressBack for popBackStack
pressBack needs a navigation controller. TV UI doesn't have a navigation controller so we must pop the back stack via FragmentManager instead. Change-Id: Ie73f788a1de05b5698ad55455ac19ff4f22d157b Test: atest CtsPermission3TestCases Bug: 231680367
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java
index 43c59b845..a5961dcec 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/television/AppPermissionFragment.java
@@ -34,7 +34,6 @@ import static com.android.permissioncontroller.permission.ui.GrantPermissionsVie
import static com.android.permissioncontroller.permission.ui.ManagePermissionsActivity.EXTRA_CALLER_NAME;
import static com.android.permissioncontroller.permission.ui.ManagePermissionsActivity.EXTRA_RESULT_PERMISSION_INTERACTED;
import static com.android.permissioncontroller.permission.ui.ManagePermissionsActivity.EXTRA_RESULT_PERMISSION_RESULT;
-import static com.android.permissioncontroller.permission.ui.handheld.UtilsKt.pressBack;
import android.app.Activity;
import android.app.AlertDialog;
@@ -272,7 +271,7 @@ public class AppPermissionFragment extends SettingsWithHeader
private void setRadioButtonsState(Map<ButtonType, ButtonState> states) {
if (states == null && mViewModel.getButtonStateLiveData().isInitialized()) {
- pressBack(this);
+ getFragmentManager().popBackStack();
Log.w(LOG_TAG, "invalid package " + mPackageName + " or perm group "
+ mPermGroupName);
Toast.makeText(