diff options
| author | 2022-08-16 10:09:48 +0800 | |
|---|---|---|
| committer | 2022-08-16 02:16:54 +0000 | |
| commit | 1779ab1e5d4fed907353b7febe645b36c8a40322 (patch) | |
| tree | 870a0bbcba576647ce73fdbdfca897bb55ec7515 | |
| parent | 4947508620802ea621edbf498bf54b3cc453d7b4 (diff) | |
Fix violation in DecorContext
The issue happens when activity is launched on the secondary
display. It's because the base context of DecorContext is
a DisplayContext, but we should check #isConfigurationContext in
associatd window's Context instead, like DecorContext#isUiContext
fixes: 242571036
Test: manual - launch activity on the secondary display
Change-Id: Ie2659fb31248ad64099018bfebb6a6b43c72f466
| -rw-r--r-- | core/java/com/android/internal/policy/DecorContext.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/com/android/internal/policy/DecorContext.java b/core/java/com/android/internal/policy/DecorContext.java index 5e34c15c42e2..134a91710c0b 100644 --- a/core/java/com/android/internal/policy/DecorContext.java +++ b/core/java/com/android/internal/policy/DecorContext.java @@ -137,4 +137,13 @@ public class DecorContext extends ContextThemeWrapper { } return false; } + + @Override + public boolean isConfigurationContext() { + Context context = mContext.get(); + if (context != null) { + return context.isConfigurationContext(); + } + return false; + } } |