commit ed85c7d201916b17fd12b162f6596c9160e7ea78
author Treehugger Robot <treehugger-gerrit@google.com> Sat Feb 22 15:14:31 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Feb 22 15:14:31 2020 +0000
tree acf9165c46263538000e648c9d0cafb308e0ea43
parent efaca9a999ad180907ab1663330a64d48a1cb815
parent d79eb6f9e5d9f0572e418927eaf6b595685d0889

Merge "Fix the PIN2 input screen remains while deleting FDN"

src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java

diff --git a/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java b/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java
index 92baa97..8b17cfb 100644
--- a/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java
+++ b/src/com/android/phone/settings/fdn/DeleteFdnContactScreen.java
@@ -64,7 +64,8 @@
 
         resolveIntent();
 
-        authenticatePin2();
+        // Starts PIN2 authentication only for the first time.
+        if (icicle == null) authenticatePin2();
 
         getWindow().requestFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
         setContentView(R.layout.delete_fdn_contact_screen);