Remove redundant wake up while launching camera
Remove wake up code from `screenTurnedOff` for we alreay wake up device when the camera gesture has been detected, Bug: 251700246 Test: double tap power to trigger camera Change-Id: I99355b870d0c13335d719364a45f66cba31abb86
This commit is contained in:
@@ -4195,7 +4195,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
|
|||||||
if (mRequestedOrSleepingDefaultDisplay) {
|
if (mRequestedOrSleepingDefaultDisplay) {
|
||||||
mCameraGestureTriggeredDuringGoingToSleep = true;
|
mCameraGestureTriggeredDuringGoingToSleep = true;
|
||||||
// Wake device up early to prevent display doing redundant turning off/on stuff.
|
// Wake device up early to prevent display doing redundant turning off/on stuff.
|
||||||
wakeUpFromPowerKey(event.getDownTime());
|
wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,
|
||||||
|
PowerManager.WAKE_REASON_CAMERA_LAUNCH,
|
||||||
|
"android.policy:CAMERA_GESTURE_PREVENT_LOCK");
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -4728,11 +4730,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
|
|||||||
}
|
}
|
||||||
mDefaultDisplayRotation.updateOrientationListener();
|
mDefaultDisplayRotation.updateOrientationListener();
|
||||||
reportScreenStateToVrManager(false);
|
reportScreenStateToVrManager(false);
|
||||||
if (mCameraGestureTriggeredDuringGoingToSleep) {
|
|
||||||
wakeUp(SystemClock.uptimeMillis(), mAllowTheaterModeWakeFromPowerKey,
|
|
||||||
PowerManager.WAKE_REASON_CAMERA_LAUNCH,
|
|
||||||
"com.android.systemui:CAMERA_GESTURE_PREVENT_LOCK");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user