From 582314e8e8ec25405a65396892d00bf67f24eb1f Mon Sep 17 00:00:00 2001
From: Steven Ng <stevenckng@google.com>
Date: Thu, 22 Apr 2021 13:22:32 +0100
Subject: [PATCH] Only update entries if there is a change in expand / collapse
 state

Test: In all widgets tray, switch to work profile. Expands an app.
      Switch to personal tab and then switch back to work tab.
      The previously expanded app is collapsed with correct arrow.
Bug: 184199207
Change-Id: Iac601a04412cb8c5f163483c5dd79da35f1fd05c
---
 .../android/launcher3/widget/picker/WidgetsListAdapter.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
index d9c9d4d71b..0504e74695 100644
--- a/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
+++ b/src/com/android/launcher3/widget/picker/WidgetsListAdapter.java
@@ -186,8 +186,10 @@ public class WidgetsListAdapter extends Adapter<ViewHolder> implements OnHeaderC
      * Resets any expanded widget header.
      */
     public void resetExpandedHeader() {
-        mWidgetsContentVisiblePackageUserKey = null;
-        updateVisibleEntries();
+        if (mWidgetsContentVisiblePackageUserKey != null) {
+            mWidgetsContentVisiblePackageUserKey = null;
+            updateVisibleEntries();
+        }
     }
 
     @Override