diff options
| author | Jiyong Park <jiyong@google.com> | 2018-04-11 21:14:26 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-04-11 21:14:26 +0900 |
| commit | 1452baeffa18c2760dac56bee26c20fa12a499a3 (patch) | |
| tree | e1e6c5922257450926c99e481c50fd42cedba61e /packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java | |
| parent | 5c521b2e9db825519d7b287acc58378912b56b69 (diff) | |
| parent | 8dcd862081e335405aecacd1d10e095cd78f7116 (diff) | |
Update to PPR1.180411.001
Conflicts:
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java
services/core/java/com/android/server/om/OverlayManagerSettings.java
Change-Id: I44e49cb1dc1cf3f10e12b49ca84d0cb486925d08
Diffstat (limited to 'packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java index d63ad0840734..00cd5a7b1689 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardAbsKeyInputView.java @@ -265,11 +265,11 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout mPendingLockCheck.cancel(false); mPendingLockCheck = null; } + reset(); } @Override public void onResume(int reason) { - reset(); } @Override |