Skip to content

Commit 4fc4527

Browse files
author
Jeff Brown
committed
Don't enable input dispatch until the screen is visible.
When we defer making the screen visible (waiting for the lock screen to be ready) the screen may actually be on but covered by a black surface. We need to make sure to ignore any touches on the screen during this time until the black surface is about to be removed. Bug: 7318962 Change-Id: I50eb7dcf05295cd276925625240996c4b80c5fe2
1 parent 78eb122 commit 4fc4527

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3692,11 +3692,6 @@ public void screenTurningOn(final ScreenOnListener screenOnListener) {
36923692
updateLockScreenTimeout();
36933693
}
36943694

3695-
try {
3696-
mWindowManager.setEventDispatching(true);
3697-
} catch (RemoteException unhandled) {
3698-
}
3699-
37003695
waitForKeyguard(screenOnListener);
37013696
}
37023697

@@ -3747,6 +3742,11 @@ private void finishScreenTurningOn(ScreenOnListener screenOnListener) {
37473742
mScreenOnFully = true;
37483743
}
37493744

3745+
try {
3746+
mWindowManager.setEventDispatching(true);
3747+
} catch (RemoteException unhandled) {
3748+
}
3749+
37503750
if (screenOnListener != null) {
37513751
screenOnListener.onScreenOn();
37523752
}

0 commit comments

Comments
 (0)