Merge "Register and update input settings after boot" into udc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
783c600593
@@ -500,8 +500,6 @@ public class InputManagerService extends IInputManager.Stub
|
|||||||
|
|
||||||
// Add ourselves to the Watchdog monitors.
|
// Add ourselves to the Watchdog monitors.
|
||||||
Watchdog.getInstance().addMonitor(this);
|
Watchdog.getInstance().addMonitor(this);
|
||||||
|
|
||||||
mSettingsObserver.registerAndUpdate();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(BT) Pass in parameter for bluetooth system
|
// TODO(BT) Pass in parameter for bluetooth system
|
||||||
@@ -512,6 +510,8 @@ public class InputManagerService extends IInputManager.Stub
|
|||||||
|
|
||||||
mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);
|
mDisplayManagerInternal = LocalServices.getService(DisplayManagerInternal.class);
|
||||||
|
|
||||||
|
mSettingsObserver.registerAndUpdate();
|
||||||
|
|
||||||
synchronized (mLidSwitchLock) {
|
synchronized (mLidSwitchLock) {
|
||||||
mSystemReady = true;
|
mSystemReady = true;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user