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

Commit 2c565826 authored by Shibin George's avatar Shibin George Committed by android-build-merger
Browse files

Merge \"Resolve deadlock between ActivityManagerService and PowerManagerService\" 

am: 06561db2

Change-Id: I7f78cf1ef0c490aceb527dbc82228d00fae2f7e4
parents b417585b 06561db2

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

+19 −19
Original line number Diff line number Diff line
@@ -591,25 +591,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(
@@ -667,6 +648,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() {