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

1 files changed, 5 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java
index f0a823e8af34..90e092d57ebd 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java
@@ -78,6 +78,11 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
                     }
                     break;
                 }
+                case READY: {
+                    mRemainingAttempts = -1;
+                    resetState();
+                    break;
+                }
                 default:
                     resetState();
             }