SysUI: Fix race condition that is causing test failure

Test: runtest systemui
Change-Id: I7f3bf7bbcc75820231fd59ca20551ac377dea601

1 files changed, 4 insertions, 2 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
index 5c23eb742270..ce7294204b48 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java
@@ -307,8 +307,10 @@ public class TileServices extends IQSService.Stub {
     }
 
     public void destroy() {
-        mServices.values().forEach(service -> service.handleDestroy());
-        mContext.unregisterReceiver(mRequestListeningReceiver);
+        synchronized (mServices) {
+            mServices.values().forEach(service -> service.handleDestroy());
+            mContext.unregisterReceiver(mRequestListeningReceiver);
+        }
     }
 
     private final BroadcastReceiver mRequestListeningReceiver = new BroadcastReceiver() {