Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc15e5b9 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

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

Merge commit '44e43d1f'

* commit '44e43d1f':
  InputMethodManagerService: Fix acore crash on boot up
parents 8584909e 44e43d1f

services/java/com/android/server/InputMethodManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -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();

    }