Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add "not supported" string for MMI codes not supported by network." into tm-qpr-dev am: 62061b5a58

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20544619

Change-Id: I68adb321043b5b9915983a72cb1d6e022f952098
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-12-07 09:54:52 +00:00
committed by Automerger Merge Worker
parent fd2b0fad24 62061b5a58
commit e8339fbcde
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/strings.xml
View File

@@ -46,6 +46,9 @@
<!-- Displayed when the user dialed an MMI code whose function <!-- Displayed when the user dialed an MMI code whose function
could not be performed. This will be displayed in a toast. --> could not be performed. This will be displayed in a toast. -->
<string name="mmiError">Connection problem or invalid MMI code.</string> <string name="mmiError">Connection problem or invalid MMI code.</string>
<!-- Displayed when the user dialed an MMI code whose function could not be performed because
the feature is not supported on the current mobile network. -->
<string name="mmiErrorNotSupported">Feature not supported.</string>
<!-- Displayed when the user dialed an MMI code whose function <!-- Displayed when the user dialed an MMI code whose function
could not be performed because FDN is enabled. This will be displayed in a toast. --> could not be performed because FDN is enabled. This will be displayed in a toast. -->
<string name="mmiFdnError">Operation is restricted to fixed dialing numbers only.</string> <string name="mmiFdnError">Operation is restricted to fixed dialing numbers only.</string>

1
core/res/res/values/symbols.xml
View File

@@ -828,6 +828,7 @@
<java-symbol type="string" name="mismatchPin" /> <java-symbol type="string" name="mismatchPin" />
<java-symbol type="string" name="mmiComplete" /> <java-symbol type="string" name="mmiComplete" />
<java-symbol type="string" name="mmiError" /> <java-symbol type="string" name="mmiError" />
<java-symbol type="string" name="mmiErrorNotSupported" />
<java-symbol type="string" name="mmiFdnError" /> <java-symbol type="string" name="mmiFdnError" />
<java-symbol type="string" name="mmiErrorWhileRoaming" /> <java-symbol type="string" name="mmiErrorWhileRoaming" />
<java-symbol type="string" name="month_day_year" /> <java-symbol type="string" name="month_day_year" />