diff options
| author | 2022-02-17 00:25:18 +0000 | |
|---|---|---|
| committer | 2022-02-17 00:25:18 +0000 | |
| commit | 9395860fc1d927f29bc602132ea0faba1f64fe4e (patch) | |
| tree | e771670bd23e5eb038e44b5e819782992cb9b2b1 /libs/WindowManager/Shell | |
| parent | d74805e935845892b3414b20d44e7cd72ac59efe (diff) | |
| parent | 87ac02f5fec6af20f34a8cf6e92118a6f2e8e770 (diff) | |
Merge "Fix NPE with overflow expanded view"
Diffstat (limited to 'libs/WindowManager/Shell')
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java index 9219baa06157..c6a68dc98da6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java @@ -1237,7 +1237,7 @@ public class BubbleStackView extends FrameLayout b.getExpandedView().updateFontSize(); } } - if (mBubbleOverflow != null) { + if (mBubbleOverflow != null && mBubbleOverflow.getExpandedView() != null) { mBubbleOverflow.getExpandedView().updateFontSize(); } } |