Merge "Fix AOD2 notifications not waking up the device if the screen off animation played." into sc-dev
This commit is contained in:
@@ -1473,9 +1473,7 @@ public class StatusBar extends SystemUI implements DemoMode,
|
|||||||
* @param why the reason for the wake up
|
* @param why the reason for the wake up
|
||||||
*/
|
*/
|
||||||
public void wakeUpIfDozing(long time, View where, String why) {
|
public void wakeUpIfDozing(long time, View where, String why) {
|
||||||
if (mDozing && !(mKeyguardViewMediator.isAnimatingScreenOff()
|
if (mDozing && !mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying()) {
|
||||||
|| mUnlockedScreenOffAnimationController
|
|
||||||
.isScreenOffLightRevealAnimationPlaying())) {
|
|
||||||
mPowerManager.wakeUp(
|
mPowerManager.wakeUp(
|
||||||
time, PowerManager.WAKE_REASON_GESTURE, "com.android.systemui:" + why);
|
time, PowerManager.WAKE_REASON_GESTURE, "com.android.systemui:" + why);
|
||||||
mWakeUpComingFromTouch = true;
|
mWakeUpComingFromTouch = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user