Merge "WaitForNegativeProximity stopped with power button." into sc-dev (e77889cb) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -2122,7 +2122,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call

		private void ignoreProximitySensorUntilChangedInternal() {
		if (!mIgnoreProximityUntilChanged
		&& mPowerRequest.useProximitySensor
		&& mProximity == PROXIMITY_POSITIVE) {
		// Only ignore if it is still reporting positive (near)
		mIgnoreProximityUntilChanged = true;

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

+10 −1

Original line number	Diff line number	Diff line
		@@ -533,6 +533,11 @@ public final class PowerManagerService extends SystemService
		// True if the proximity sensor reads a positive result.
		private boolean mProximityPositive;

		// Indicates that we have already intercepted the power key to temporarily ignore the proximity
		// wake lock and turn the screen back on. This should get reset when prox reads 'far' again
		// (when {@link #mProximityPositive} is set to false).
		private boolean mInterceptedPowerKeyForProximity;

		// Screen brightness setting limits.
		public final float mScreenBrightnessMinimum;
		public final float mScreenBrightnessMaximum;
		@@ -3318,6 +3323,7 @@ public final class PowerManagerService extends SystemService
		public void onProximityNegative() {
		synchronized (mLock) {
		mProximityPositive = false;
		mInterceptedPowerKeyForProximity = false;
		mDirty \|= DIRTY_PROXIMITY_POSITIVE;
		userActivityNoUpdateLocked(Display.DEFAULT_DISPLAY_GROUP, mClock.uptimeMillis(),
		PowerManager.USER_ACTIVITY_EVENT_OTHER, 0, Process.SYSTEM_UID);
		@@ -4158,6 +4164,8 @@ public final class PowerManagerService extends SystemService
		}
		pw.println();
		pw.println(" mRequestWaitForNegativeProximity=" + mRequestWaitForNegativeProximity);
		pw.println(" mInterceptedPowerKeyForProximity="
		+ mInterceptedPowerKeyForProximity);
		pw.println(" mSandmanScheduled=" + mSandmanScheduled);
		pw.println(" mBatteryLevelLow=" + mBatteryLevelLow);
		pw.println(" mLightDeviceIdleMode=" + mLightDeviceIdleMode);
		@@ -5989,8 +5997,9 @@ public final class PowerManagerService extends SystemService
		final DisplayPowerRequest displayPowerRequest =
		mDisplayGroupPowerStateMapper.getPowerRequestLocked(
		Display.DEFAULT_DISPLAY_GROUP);
		if (displayPowerRequest.useProximitySensor && mProximityPositive) {
		if (mProximityPositive && !mInterceptedPowerKeyForProximity) {
		mDisplayManagerInternal.ignoreProximitySensorUntilChanged();
		mInterceptedPowerKeyForProximity = true;
		return true;
		}
		}