summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorVishnu Nair <vishnun@google.com>2019-11-12 14:39:43 -0800
committerVishnu Nair <vishnun@google.com>2019-11-12 14:39:43 -0800
commitddbd25102da392990a0256374e74ed3ecf2bc956 (patch)
treeca57936debc3164c663e8d872bc96e2185f0bbaa /core/java/android
parentb66ea478d4161a5f755bca5901a26a4d81c4f35a (diff)
Allow adding EmbeddedWindows without host windows
In some cases privileged clients want to add embedded windows without requiring a host window. Client with INTERNAL_SYSTEM_WINDOW can add such a window. The system will still blame the calling PID if the embedded process stops responding but will ignore pointerDownOutsideFocus events to this embedded window since it has no host. Fixes: 144250438 Test: atest CtsWindowManagerDeviceTestCases:WindowlessWmTests Test: 1. cherry-pick ag/9618804 2. adb shell content insert --uri content://settings/secure --bind name:s:window_magnification --bind value:s:1 Change-Id: Iceef70020c6ecd31b10e92a535c27458505c9ef0
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/WindowlessWindowManager.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/view/WindowlessWindowManager.java b/core/java/android/view/WindowlessWindowManager.java
index 403bfda78292..5a5633ef5a80 100644
--- a/core/java/android/view/WindowlessWindowManager.java
+++ b/core/java/android/view/WindowlessWindowManager.java
@@ -103,8 +103,7 @@ class WindowlessWindowManager implements IWindowSession {
}
if (((attrs.inputFeatures &
- WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL) == 0) &&
- (mHostInputToken != null)) {
+ WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHANNEL) == 0)) {
try {
mRealWm.grantInputChannel(displayId, sc, window, mHostInputToken, outInputChannel);
} catch (RemoteException e) {