Merge "Fix screen flash back to previous permission grant issue" into main

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;
         }