Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a am: 8bac59265e

am: 6293483fce

Change-Id: I5b533e911f1185bb9fe1847701e333093b49926e
This commit is contained in:
Youming Ye
2018-10-15 11:41:46 -07:00
committed by android-build-merger
2 changed files with 22 additions and 4 deletions

View File

@@ -2768,6 +2768,10 @@
<string name="sim_change_succeeded">SIM PIN changed successfully</string>
<!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
<string name="sim_lock_failed">Can\u2019t change SIM card lock state.\nPossibly incorrect PIN.</string>
<!-- SIM card lock settings screen, toast after disabling PIN failed from modem -->
<string name="sim_pin_disable_failed">Can\'t disable PIN.</string>
<!-- SIM card lock settings screen, toast after enabling PIN failed from modem -->
<string name="sim_pin_enable_failed">Can\'t enable PIN.</string>
<!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
<string name="sim_enter_ok">OK</string>
<!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->