diff options
| author | Charles Chen <charlesccchen@google.com> | 2021-08-13 23:18:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 23:18:45 +0000 |
| commit | ddfa753ff0364086d9663d99695fe13f79dd963a (patch) | |
| tree | 1a862b35805debb7dfcaa3f39f72304bb966ae04 /core/java/android/inputmethodservice/AbstractInputMethodService.java | |
| parent | daddd679e8c1bbdf07550bd0fc831dfbdcd273d6 (diff) | |
| parent | cc2f80f5a09831d0b0d36a39ec6a7bf6b5d7f582 (diff) | |
Merge "Allow WPS to create windows with multiple type" into sc-v2-dev am: cc2f80f5a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15125751
Change-Id: I240b960c6689ed8caa1bf4e3c15853f23410e991
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 17d4ae6205ca..f8f0970ecfe4 100644 --- a/core/java/android/inputmethodservice/AbstractInputMethodService.java +++ b/core/java/android/inputmethodservice/AbstractInputMethodService.java @@ -309,7 +309,7 @@ public abstract class AbstractInputMethodService extends WindowProviderService @Override @Nullable public final Bundle getWindowContextOptions() { - return null; + return super.getWindowContextOptions(); } /** @hide */ |