resolve merge conflicts of a094f07d5 to nyc-mr2-dev-plus-aosp
am: 4404da4dbf
Change-Id: I00f1659c3b77a00faedc7fc15d7f7e9fa52e3cf8
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bcad6f7..965a214 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1363,6 +1363,11 @@
There are too many active calls. Please end or merge existing calls before placing a new one.
</string>
+ <!-- Call failure reason: If the network does not accept the emergency call request, e.g., because IMEI was used as identification and this capability is not supported -->
+ <string name="callFailed_imei_not_accepted">
+ Unable to connect, please insert a valid SIM card.
+ </string>
+
<!-- The title for the change voicemail PIN activity -->
<string name="change_pin_title">Change Voicemail PIN</string>
<!-- The label for the continue button in change voicemail PIN activity -->
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index 92f202a..75c6b31 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -128,6 +128,7 @@
case android.telephony.DisconnectCause.DATA_LIMIT_REACHED:
case android.telephony.DisconnectCause.DIALED_ON_WRONG_SLOT:
case android.telephony.DisconnectCause.DIALED_CALL_FORWARDING_WHILE_ROAMING:
+ case android.telephony.DisconnectCause.IMEI_NOT_ACCEPTED:
return DisconnectCause.ERROR;
case android.telephony.DisconnectCause.DIALED_MMI:
@@ -383,6 +384,10 @@
resourceId = com.android.internal.R.string.mmiErrorWhileRoaming;
break;
+ case android.telephony.DisconnectCause.IMEI_NOT_ACCEPTED:
+ resourceId = R.string.callFailed_imei_not_accepted;
+ break;
+
default:
break;
}