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

Commit 296b5eb1 authored by Steve Kondik's avatar Steve Kondik
Browse files

powermanager: Initialize SensorManager in systemReady() 

 * Service startup ordering is different on M and the sensor service
   is not ready during construction of the PowerManager. This was
   causing a hang on boot. Move it to systemReady instead.

Change-Id: I9e0293484e1aaaf9f82f9c75680bec558607c54d
parent 1ef046f0

services/core/java/com/android/server/power/PowerManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -514,8 +514,6 @@ public final class PowerManagerService extends SystemService 
                Process.THREAD_PRIORITY_DISPLAY, false /*allowIo*/);

        mHandlerThread.start();

        mHandler = new PowerManagerHandler(mHandlerThread.getLooper());

        mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);

        mProximitySensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);



        synchronized (mLock) {

            mWakeLockSuspendBlocker = createSuspendBlockerLocked("PowerManagerService.WakeLocks");
@@ -598,6 +596,10 @@ public final class PowerManagerService extends SystemService 
            mDisplayManagerInternal.initPowerManagement(

                    mDisplayPowerCallbacks, mHandler, sensorManager);



            // Initialize proximity sensor

            mSensorManager = (SensorManager) mContext.getSystemService(Context.SENSOR_SERVICE);

            mProximitySensor = mSensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY);



            // Register for broadcasts from other components of the system.

            IntentFilter filter = new IntentFilter();

            filter.addAction(Intent.ACTION_BATTERY_CHANGED);