summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Josep del Río <joseprio@google.com> 2023-03-02 21:58:04 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-03-02 21:58:04 +0000
commit7700575a3441c274ed40e180e82594e0e81ce554 (patch)
treef820b1afa17b6fe2a21195c0cf4acc3c754d58f5
parentfe4042ba5581445d9f42f620fecee8baecd57461 (diff)
parent4ae10692a685c1253131fc83891c9d883dd22ac7 (diff)
Merge "Use outerContext in the InputManager service" into udc-dev
-rw-r--r--core/java/android/app/SystemServiceRegistry.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 83e015357589..dbba0c6f5e50 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -509,7 +509,7 @@ public final class SystemServiceRegistry {
new ServiceFetcher<InputManager>() {
@Override
public InputManager getService(ContextImpl ctx) {
- return InputManager.getInstance(ctx);
+ return InputManager.getInstance(ctx.getOuterContext());
}});
registerService(Context.DISPLAY_SERVICE, DisplayManager.class,