3 files changed, 10 insertions(+), 2 deletions(-)

M image/assets/lang/English.json
M module-services/service-cellular/src/SimCard.cpp
M pure_changelog.md

@@ 224,7 224,7 @@
   "app_desktop_info_mmi_result_failed": "Failed",
   "sim_header_setup": "<text><token>$SIM</token> setup</text>",
   "sim_enter_pin_unlock": "<text>Enter the PIN code to set up <br></br> the <token>$PINTYPE</token> card:</text>",
-  "sim_enter_enter_current": "<text>Type current Pin Code:</text>",
+  "sim_enter_enter_current": "<text>Type current PIN code:</text>",
   "sim_change_pin": "Change PIN code",
   "sim_enter_new_pin": "Enter new PIN code:",
   "sim_confirm_new_pin": "Confirm new PIN code:",

@@ 227,9 227,16 @@ namespace cellular
                 }
             }
             else if (result != sim::Result::OK) {
-                if (onUnhandledCME)
+                if (result == sim::Result::SIM_PUKRequired) {
+                    // MOS-242: silence this case to avoid a misleading "wrong PUK" pop-up
+                    return false;
+                }
+
+                if (onUnhandledCME) {
                     onUnhandledCME(static_cast<unsigned int>(result));
+                }
             }
+
             return result == sim::Result::OK;
         }
 

@@ 29,6 29,7 @@
 * Fixed PLAY label translation in German
 * Fixed USB connection/disconnection detection
 * Fixed memory leaks in APN settings
+* Fixed windows flow regarding PUK requests after too many PIN mistakes
 
 ### Added
 * Added basic MMS handling