Merge "Display's transition phase checked before DPC init." into sc-v2-dev (618c83b0) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/DisplayPowerController.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -1052,11 +1052,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		}
		assert(state != Display.STATE_UNKNOWN);

		// Initialize things the first time the power state is changed.
		if (mustInitialize) {
		initialize(state);
		}

		// Apply the proximity sensor.
		if (mProximitySensor != null) {
		if (mPowerRequest.useProximitySensor && state != Display.STATE_OFF) {
		@@ -1107,6 +1102,11 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
		state = Display.STATE_OFF;
		}

		// Initialize things the first time the power state is changed.
		if (mustInitialize) {
		initialize(state);
		}

		// Animate the screen state change unless already animating.
		// The transition may be deferred, so after this point we will use the
		// actual state instead of the desired one.