commit e17d0ad5a3bb5a6d10d22c7369efc6d8ae2fdb4c
author Chaitanya Saggurthi <csaggurt@qti.qualcomm.com> Tue Jul 21 16:10:50 2015 +0530
committer Sanket Padawe <sanketpadawe@google.com> Tue Mar 29 16:42:36 2016 -0700
tree f74cfa60424eaa8676f08bcc94bdf581a8ef60f5
parent 0ac7ec193e7a0a1750be0ac07ed31bfcaf4bb00a

Fix to update the Change PIN2 UI based on PIN2 state

Add code in onResume of FdnSetting to update the Change
PIN2 UI checking the PIN2 blocked state.
If PIN2 state is blocked, show user the PUK2 dialog else
show the change PIN2 dialog.

bug: 22930273
Change-Id: Ica1c585d74d62f72b41122cf7bc56e4be0d1a3ed

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

diff --git a/src/com/android/phone/settings/fdn/FdnSetting.java b/src/com/android/phone/settings/fdn/FdnSetting.java
index ac43cce..c76f91d 100644
--- a/src/com/android/phone/settings/fdn/FdnSetting.java
+++ b/src/com/android/phone/settings/fdn/FdnSetting.java
@@ -468,6 +468,20 @@
         }
     }
 
+    /**
+    * Reflect the updated change PIN2 state in the UI.
+    */
+    private void updateChangePIN2() {
+        if (mPhone.getIccCard().getIccPin2Blocked()) {
+            // If the pin2 is blocked, the state of the change pin2 dialog
+            // should be set for puk2 use (that is, the user should be prompted
+            // to enter puk2 code instead of old pin2).
+            resetPinChangeStateForPUK2();
+        } else {
+            resetPinChangeState();
+        }
+    }
+
     @Override
     protected void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -518,6 +532,7 @@
         super.onResume();
         mPhone = mSubscriptionInfoHelper.getPhone();
         updateEnableFDN();
+        updateChangePIN2();
     }
 
     /**