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

Commit d1e144ea authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Merge "Register and update input settings after boot" into udc-dev am: 783c6005 am: 4859006b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23373898



Change-Id: Ie03399c7d189c3b0fa8ce272c587b62875c3f835
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 108b5ca2 4859006b

services/core/java/com/android/server/input/InputManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -493,8 +493,6 @@ public class InputManagerService extends IInputManager.Stub 


        // Add ourselves to the Watchdog monitors.

        Watchdog.getInstance().addMonitor(this);



        mSettingsObserver.registerAndUpdate();

    }



    // TODO(BT) Pass in parameter for bluetooth system
@@ -505,6 +503,8 @@ public class InputManagerService extends IInputManager.Stub 


        mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);



        mSettingsObserver.registerAndUpdate();



        synchronized (mLidSwitchLock) {

            mSystemReady = true;