Merge "Improve camera launch time from double tap power" into tm-qpr-dev (84d0bab4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -4125,6 +4125,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mCameraGestureTriggered = true;
		if (mRequestedOrSleepingDefaultDisplay) {
		mCameraGestureTriggeredDuringGoingToSleep = true;
		// Wake device up early to prevent display doing redundant turning off/on stuff.
		wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,
		PowerManager.WAKE_REASON_CAMERA_LAUNCH,
		"android.policy:CAMERA_GESTURE_PREVENT_LOCK");
		}
		return true;
		}
		@@ -4656,11 +4660,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		mDefaultDisplayRotation.updateOrientationListener();
		reportScreenStateToVrManager(false);
		if (mCameraGestureTriggeredDuringGoingToSleep) {
		wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,
		PowerManager.WAKE_REASON_CAMERA_LAUNCH,
		"com.android.systemui:CAMERA_GESTURE_PREVENT_LOCK");
		}
		}
		}