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, 7 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
index 651831eea517..174dcaba0759 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardPatternView.java
@@ -157,6 +157,13 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
         if (button != null) {
             button.setCallback(this);
         }
+
+        View cancelBtn = findViewById(R.id.cancel_button);
+        if (cancelBtn != null) {
+            cancelBtn.setOnClickListener(view -> {
+                mCallback.reset();
+            });
+        }
     }
 
     @Override