diff options
author | Danesh M <daneshm90@gmail.com> | 2016-03-13 11:32:47 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-03-14 10:37:01 -0700 |
commit | f9a9d50491dc583ea568a4f12e57a2f97b9baacb (patch) | |
tree | b70b4c41c1540d69c461ecafdaa8fd8e9b2584b9 /services | |
parent | cf0838545cb7f365a0e9b6adfebfbd78579cbeb0 (diff) | |
download | frameworks_base-f9a9d50491dc583ea568a4f12e57a2f97b9baacb.zip frameworks_base-f9a9d50491dc583ea568a4f12e57a2f97b9baacb.tar.gz frameworks_base-f9a9d50491dc583ea568a4f12e57a2f97b9baacb.tar.bz2 |
InputMethodManager : Move registration to systemReady
Move registration to systemReady() so that CMHardware
is in a ready state for us to start interacting with.
CYNGNOS-1166
Change-Id: I37177c5e99bbe3850c82c6e1da36e9da80279456
Diffstat (limited to 'services')
-rw-r--r-- | services/core/java/com/android/server/InputMethodManagerService.java | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 92407bd..a9f6e40 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -962,17 +962,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } } - // Must happen before registerContentObserverLocked - mCMHardware = CMHardwareManager.getInstance(mContext); - - synchronized (mMethodMap) { - mSettingsObserver.registerContentObserverLocked(userId); - updateFromSettingsLocked(true); - } - - updateTouchHovering(); - updateTouchSensitivity(); - // IMMS wants to receive Intent.ACTION_LOCALE_CHANGED in order to update the current IME // according to the new system locale. final IntentFilter filter = new IntentFilter(); @@ -1136,6 +1125,16 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } if (!mSystemReady) { mSystemReady = true; + // Must happen before registerContentObserverLocked + mCMHardware = CMHardwareManager.getInstance(mContext); + + mSettingsObserver.registerContentObserverLocked( + mSettings.getCurrentUserId()); + updateFromSettingsLocked(true); + + updateTouchHovering(); + updateTouchSensitivity(); + mKeyguardManager = (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE); mNotificationManager = (NotificationManager) |