commit f1adf08738ef0cd73b9c9113db66e33384d62491
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Feb 15 20:52:10 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 15 20:52:10 2022 +0000
tree 8369296cbb001ea2e296d252763feeba2180c906
parent 99deef06b1a20616b933f44ffac7f6793cdb4566
parent 5763f3a1f458b66692b0753f07f82455c92a626b

Merge "Assert add/removeCallbacks are from main thread in DevicePostureControllerImpl"

packages/SystemUI/src/com/android/systemui/statusbar/policy/DevicePostureControllerImpl.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DevicePostureControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DevicePostureControllerImpl.java
index 8471e0a..a32a5ab 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DevicePostureControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DevicePostureControllerImpl.java
@@ -25,6 +25,7 @@
 import com.android.internal.R;
 import com.android.systemui.dagger.SysUISingleton;
 import com.android.systemui.dagger.qualifiers.Main;
+import com.android.systemui.util.Assert;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -70,6 +71,7 @@
         }
 
         deviceStateManager.registerCallback(executor, state -> {
+            Assert.isMainThread();
             mCurrentDevicePosture =
                     mDeviceStateToPostureMap.get(state, DEVICE_POSTURE_UNKNOWN);
 
@@ -79,11 +81,13 @@
 
     @Override
     public void addCallback(@NonNull Callback listener) {
+        Assert.isMainThread();
         mListeners.add(listener);
     }
 
     @Override
     public void removeCallback(@NonNull Callback listener) {
+        Assert.isMainThread();
         mListeners.remove(listener);
     }