summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Charles Chen <charlesccchen@google.com> 2022-08-16 10:09:48 +0800
committer Charles Chen <charlesccchen@google.com> 2022-08-16 15:22:49 +0000
commitd9bdee7fa00e02cd887c084d365adaf754ffd492 (patch)
treee34dd0aa2c34f8e1a5abad78438ce418b5a32e9c
parent15a8232e381f186316e6f81998b54c9ce24a8d89 (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 Merged-In: Ie2659fb31248ad64099018bfebb6a6b43c72f466 Change-Id: Ie2659fb31248ad64099018bfebb6a6b43c72f466
-rw-r--r--core/java/com/android/internal/policy/DecorContext.java9
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;
+ }
}