commit 2febffb2658f4de85aee31a11fc2c1ae32077149
author Qingxi Li <qingxi@google.com> Tue Jan 23 16:16:35 2018 -0800
committer Qingxi Li <qingxi@google.com> Mon Jan 29 15:44:43 2018 -0800
tree c7717cd5e56cba01dd2b460a318cd76175e04cd0
parent 41234f624892d183a0a7e6d2dc195159e55e5019

Add alert dialog for disabling current eSIM profile failed

This CL add an alert dialog under SIM PIN/PUK screen when users try to
disable current eSIM profile and failed.

Bug: 62680294
Test: E2E
Change-Id: I97d8cf1ae8fb30ece48c4731e72bfdfedf69d49a

packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java
index afee8ec..347c979 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java
@@ -181,7 +181,7 @@
             }
         }
         if (isEsimLocked) {
-            msg = msg + " " + rez.getString(R.string.kg_sim_lock_instructions_esim);
+            msg = rez.getString(R.string.kg_sim_lock_esim_instructions, msg);
         }
         mSecurityMessageDisplay.setMessage(msg);
         mSimImageView.setImageTintList(ColorStateList.valueOf(color));
@@ -231,6 +231,10 @@
                     R.string.kg_password_puk_failed;
             displayMessage = getContext().getString(msgId);
         }
+        if (KeyguardEsimArea.isEsimLocked(mContext, mSubId)) {
+            displayMessage = getResources()
+                    .getString(R.string.kg_sim_lock_esim_instructions, displayMessage);
+        }
         if (DEBUG) Log.d(LOG_TAG, "getPukPasswordErrorMessage:"
                 + " attemptsRemaining=" + attemptsRemaining + " displayMessage=" + displayMessage);
         return displayMessage;