diff options
| author | Charles Chen <charlesccchen@google.com> | 2021-08-13 23:52:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 23:52:49 +0000 |
| commit | 4b69612c7f40156a03b8c9b4519672b71c59e2ee (patch) | |
| tree | 45ffc0d74d49ba9e3bfa3bb633e91fc88f292d28 /core/java/android/inputmethodservice/AbstractInputMethodService.java | |
| parent | 7fce64bafd7a87cfcb1529fd9077ccf1b072a2e3 (diff) | |
| parent | ddfa753ff0364086d9663d99695fe13f79dd963a (diff) | |
Merge "Allow WPS to create windows with multiple type" into sc-v2-dev am: cc2f80f5a0 am: ddfa753ff0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15125751
Change-Id: I3e6c55f06e97c0a5e72cac7b181db4d0e2d0e624
Diffstat (limited to 'core/java/android/inputmethodservice/AbstractInputMethodService.java')
| -rw-r--r-- | core/java/android/inputmethodservice/AbstractInputMethodService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/inputmethodservice/AbstractInputMethodService.java b/core/java/android/inputmethodservice/AbstractInputMethodService.java index 9db41c41c31c..a6e77023790c 100644 --- a/core/java/android/inputmethodservice/AbstractInputMethodService.java +++ b/core/java/android/inputmethodservice/AbstractInputMethodService.java @@ -294,7 +294,7 @@ public abstract class AbstractInputMethodService extends WindowProviderService @Override @Nullable public final Bundle getWindowContextOptions() { - return null; + return super.getWindowContextOptions(); } /** @hide */ |