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

Commit 47219a42 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 

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



Change-Id: Id8f6c759f6e1842d05b68335cd290e4040e52fb3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb1835a5 783c6005

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

+2 −2
Original line number Diff line number Diff line
@@ -500,8 +500,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
@@ -512,6 +510,8 @@ public class InputManagerService extends IInputManager.Stub 


        mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);



        mSettingsObserver.registerAndUpdate();



        synchronized (mLidSwitchLock) {

            mSystemReady = true;