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

Commit 6e544617 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Guard against possible AMS/PMS deadlock. 

PMS can't call into AMS while holding its local lock.

Test: builds, boots
Bug: 35410906
Change-Id: Ib80bbee5c0c3e5fb39ffef324e8176027da83f2f
parent 14fd9ceb

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

+55 −54
Original line number Diff line number Diff line
@@ -674,9 +674,6 @@ public final class PowerManagerService extends SystemService 
                    mAppOps, createSuspendBlockerLocked("PowerManagerService.Broadcasts"),

                    mPolicy);



            final ContentResolver resolver = mContext.getContentResolver();

            mConstants.start(resolver);



            mWirelessChargerDetector = new WirelessChargerDetector(sensorManager,

                    createSuspendBlockerLocked("PowerManagerService.WirelessChargerDetector"),

                    mHandler);
@@ -689,6 +686,16 @@ public final class PowerManagerService extends SystemService 
            mDisplayManagerInternal.initPowerManagement(

                    mDisplayPowerCallbacks, mHandler, sensorManager);



            // Go.

            readConfigurationLocked();

            updateSettingsLocked();

            mDirty |= DIRTY_BATTERY_STATE;

            updatePowerStateLocked();

        }



        final ContentResolver resolver = mContext.getContentResolver();

        mConstants.start(resolver);



        // Register for settings changes.

        resolver.registerContentObserver(Settings.Secure.getUriFor(

                Settings.Secure.SCREENSAVER_ENABLED),
@@ -740,12 +747,6 @@ public final class PowerManagerService extends SystemService 
                Slog.e(TAG, "Failed to register VR mode state listener: " + e);

            }

        }

            // Go.

            readConfigurationLocked();

            updateSettingsLocked();

            mDirty |= DIRTY_BATTERY_STATE;

            updatePowerStateLocked();

        }



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

        IntentFilter filter = new IntentFilter();