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

Commit 06561db2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Resolve deadlock between ActivityManagerService and PowerManagerService"

parents fcae6130 43f5de01

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

+19 −19
Original line number Diff line number Diff line
@@ -553,25 +553,6 @@ public final class PowerManagerService extends SystemService 
            mDisplayManagerInternal.initPowerManagement(

                    mDisplayPowerCallbacks, mHandler, sensorManager);



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

            IntentFilter filter = new IntentFilter();

            filter.addAction(Intent.ACTION_BATTERY_CHANGED);

            filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

            mContext.registerReceiver(new BatteryReceiver(), filter, null, mHandler);



            filter = new IntentFilter();

            filter.addAction(Intent.ACTION_DREAMING_STARTED);

            filter.addAction(Intent.ACTION_DREAMING_STOPPED);

            mContext.registerReceiver(new DreamReceiver(), filter, null, mHandler);



            filter = new IntentFilter();

            filter.addAction(Intent.ACTION_USER_SWITCHED);

            mContext.registerReceiver(new UserSwitchedReceiver(), filter, null, mHandler);



            filter = new IntentFilter();

            filter.addAction(Intent.ACTION_DOCK_EVENT);

            mContext.registerReceiver(new DockReceiver(), filter, null, mHandler);



            // Register for settings changes.

            final ContentResolver resolver = mContext.getContentResolver();

            resolver.registerContentObserver(Settings.Secure.getUriFor(
@@ -619,6 +600,25 @@ public final class PowerManagerService extends SystemService 
            mDirty |= DIRTY_BATTERY_STATE;

            updatePowerStateLocked();

        }



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

        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_BATTERY_CHANGED);

        filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);

        mContext.registerReceiver(new BatteryReceiver(), filter, null, mHandler);



        filter = new IntentFilter();

        filter.addAction(Intent.ACTION_DREAMING_STARTED);

        filter.addAction(Intent.ACTION_DREAMING_STOPPED);

        mContext.registerReceiver(new DreamReceiver(), filter, null, mHandler);



        filter = new IntentFilter();

        filter.addAction(Intent.ACTION_USER_SWITCHED);

        mContext.registerReceiver(new UserSwitchedReceiver(), filter, null, mHandler);



        filter = new IntentFilter();

        filter.addAction(Intent.ACTION_DOCK_EVENT);

        mContext.registerReceiver(new DockReceiver(), filter, null, mHandler);

    }



    private void readConfigurationLocked() {