diff options
| author | 2025-01-27 13:30:53 -0800 | |
|---|---|---|
| committer | 2025-01-27 13:30:53 -0800 | |
| commit | 9b71aceeaa6261869924ba4bdad6b714d528ee2c (patch) | |
| tree | b7dc91782354cc18136afb6418c91539a1012654 | |
| parent | 4fdb695efc84d6e5b9445a599fc53076b67bcb4e (diff) | |
| parent | 296bb84a51e4862ff3221e94498b22ba5ede29c9 (diff) | |
Merge "Fix Exception in SysUiState" into main
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/model/SysUiState.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/model/SysUiState.java b/packages/SystemUI/src/com/android/systemui/model/SysUiState.java index 67fe0e981b09..1a5e605c96f8 100644 --- a/packages/SystemUI/src/com/android/systemui/model/SysUiState.java +++ b/packages/SystemUI/src/com/android/systemui/model/SysUiState.java @@ -79,7 +79,8 @@ public class SysUiState implements Dumpable { /** Methods to this call can be chained together before calling {@link #commitUpdate(int)}. */ public SysUiState setFlag(@SystemUiStateFlags long flag, boolean enabled) { - final Boolean overrideOrNull = mSceneContainerPlugin.flagValueOverride(flag); + final Boolean overrideOrNull = mSceneContainerPlugin != null + ? mSceneContainerPlugin.flagValueOverride(flag) : null; if (overrideOrNull != null && enabled != overrideOrNull) { if (DEBUG) { Log.d(TAG, "setFlag for flag " + flag + " and value " + enabled + " overridden to " |