Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 44e43d1f: resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp

Browse Source 
Merge commit '44e43d1f6593ae912b3818692058196233cd4ac9'

* commit '44e43d1f6593ae912b3818692058196233cd4ac9':
  InputMethodManagerService: Fix acore crash on boot up
This commit is contained in:
Jean-Baptiste Queru
2010-08-11 12:35:30 -07:00
committed by Android Git Automerger
parent 8584909e7f 44e43d1f65
commit dc15e5b903
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -466,6 +466,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
screenOnOffFilt.addAction(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
mContext.registerReceiver(new ScreenOnOffReceiver(), screenOnOffFilt);
mStatusBar = statusBar;
statusBar.setIconVisibility("ime", false);
buildInputMethodListLocked(mMethodList, mMethodMap);
final String enabledStr = Settings.Secure.getString(
@@ -509,9 +512,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
}
}
mStatusBar = statusBar;
statusBar.setIconVisibility("ime", false);
mSettingsObserver = new SettingsObserver(mHandler);
updateFromSettingsLocked();
}