Fix screen flash back to previous permission grant issue

When PermissionController handles health permissions, it redirects to HealthFitness module. When HF activity finishes, PC currently flashes back to previous permission group UI, which is a bugish user experience.

This CL solves this problem, by clearing out any UI on PermissionController before it redirects to HealthFitness.

Flag: EXEMPT bugfix
Bug: 400787130
Test: Manual testing
Relnote: Fix screen flash in permission grant dialog
Change-Id: Ic52bb7a46a6fdb449aec4de60d5ed6b7f142c958

1 files changed, 12 insertions, 0 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
index a7114f30b..7573b571d 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/GrantPermissionsActivity.java
@@ -715,6 +715,18 @@ public class GrantPermissionsActivity extends SettingsActivity
             onRequestInfoLoad(mRequestInfos);
             return;
         } else if (info.getPrompt() == Prompt.NO_UI_HEALTH_REDIRECT) {
+            // Clear UI on current PermissionController screen to avoid flashing back to previous
+            // permission group UI when returned from Health&Fitness.
+            mViewHandler.updateUi(
+                /* groupName= */ "",
+                /* groupCount= */ 0,
+                /* groupIndex= */ 0,
+                /* icon= */ null,
+                /* message= */ "",
+                /* detailMessage= */ "",
+                /* permissionRationaleMessage= */ "",
+                /* buttonVisibilities= */ new boolean[] {},
+                /* locationVisibilities=*/ new boolean[] {});
             mViewModel.handleHealthConnectPermissions(this);
             return;
         }