SysUI: Fix race condition that is causing test failure

Test: runtest systemui Change-Id: I7f3bf7bbcc75820231fd59ca20551ac377dea601
2017-01-27 13:46:51 -05:00
parent 9ef7307324
commit 809aadf69e
1 changed files with 4 additions and 2 deletions
--- 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() {