From 46e414c47b2999c7ba337a18994543ea0b2e216a Mon Sep 17 00:00:00 2001
From: Anna Zappone <azappone@google.com>
Date: Mon, 10 May 2021 17:15:17 +0100
Subject: [PATCH] Fix flaky tests in PeopleSpaceWidgetManager

Test: PeopleSpaceWidgetManagerTest
Bug: 187469743
Change-Id: Id40811a0adbf51b9d1a3e0cccd34acbdac99f425
---
 .../systemui/people/widget/PeopleSpaceWidgetManagerTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java
index 107ce289723d9..d63c529778b81 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/people/widget/PeopleSpaceWidgetManagerTest.java
@@ -1041,7 +1041,6 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase {
         Bundle newOptions = new Bundle();
         mManager.onAppWidgetOptionsChanged(SECOND_WIDGET_ID_WITH_SHORTCUT, newOptions);
 
-
         // Check that options is not modified
         verify(mAppWidgetManager, never()).updateAppWidgetOptions(
                 eq(SECOND_WIDGET_ID_WITH_SHORTCUT), any());
@@ -1478,6 +1477,8 @@ public class PeopleSpaceWidgetManagerTest extends SysuiTestCase {
         widgetSp5.edit().clear().commit();
         SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
         sp.edit().clear().commit();
+        mManager.mListeners.clear();
+        mManager.mTiles.clear();
     }
 
     private void setStorageForTile(String shortcutId, String packageName, int widgetId,