Merge "Guard against possible AMS/PMS deadlock." (586b6b2c) · Commits · e / os / android_frameworks_base

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();