diff options
| author | 2017-08-07 22:54:32 +0000 | |
|---|---|---|
| committer | 2017-08-07 22:54:32 +0000 | |
| commit | 846f7ffeb6871b0ec03d7e6ac3179cf453430264 (patch) | |
| tree | 3e541387a4b9bf9d0981e9b80b5709f68f711190 | |
| parent | c4aea904b68f2e9872b3704282fbadf105bdfe18 (diff) | |
| parent | 5778e85c6d3166037f056508fcefc089ac975086 (diff) | |
Merge "Bind SpellCheckerService as IMPORTANT_BACKGROUND" into oc-mr1-dev am: cb921c1efc
am: 5778e85c6d
Change-Id: I6a1ffc12c4a066075828e7d4555f4df9d5f764e5
| -rw-r--r-- | services/core/java/com/android/server/InputMethodManagerService.java | 6 | ||||
| -rw-r--r-- | services/core/java/com/android/server/TextServicesManagerService.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 814e4be28ffa..c23757fca381 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -214,8 +214,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub Context.BIND_AUTO_CREATE | Context.BIND_NOT_VISIBLE | Context.BIND_NOT_FOREGROUND - | Context.BIND_IMPORTANT_BACKGROUND - | Context.BIND_SHOWING_UI; + | Context.BIND_IMPORTANT_BACKGROUND; /** * Binding flags used only while the {@link InputMethodService} is showing window. @@ -223,7 +222,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private static final int IME_VISIBLE_BIND_FLAGS = Context.BIND_AUTO_CREATE | Context.BIND_TREAT_LIKE_ACTIVITY - | Context.BIND_FOREGROUND_SERVICE; + | Context.BIND_FOREGROUND_SERVICE + | Context.BIND_SHOWING_UI; @Retention(SOURCE) @IntDef({HardKeyboardBehavior.WIRELESS_AFFORDANCE, HardKeyboardBehavior.WIRED_AFFORDANCE}) diff --git a/services/core/java/com/android/server/TextServicesManagerService.java b/services/core/java/com/android/server/TextServicesManagerService.java index 21e9dca59003..77cd24ae144b 100644 --- a/services/core/java/com/android/server/TextServicesManagerService.java +++ b/services/core/java/com/android/server/TextServicesManagerService.java @@ -591,7 +591,7 @@ public class TextServicesManagerService extends ITextServicesManager.Stub { Slog.w(TAG, "bind service: " + info.getId()); } if (!bindCurrentSpellCheckerService(serviceIntent, connection, - Context.BIND_AUTO_CREATE | Context.BIND_FOREGROUND_SERVICE_WHILE_AWAKE)) { + Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT_BACKGROUND)) { Slog.e(TAG, "Failed to get a spell checker service."); return null; } |