diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-17 23:29:13 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-07-17 23:29:13 +0000 |
commit | f992b3f3e801e5fca5b040bef34879aa0366954e (patch) | |
tree | 2d0c63e5e464ce39e9d9f93350cffb3e88f194a1 | |
parent | 1dd4005a10daedf10bc97c05fd9e31e7c44ef013 (diff) | |
parent | 5ee70fe0c3b1cb997b0f5e134982f4565ac7772a (diff) | |
download | Telephony-security-pi-release.tar.gz |
Merge cherrypicks of [4562103, 4560827, 4563998, 4563999, 4564000, 4564001, 4564351, 4564352, 4564333, 4564033, 4560455, 4564034, 4560674, 4560675, 4563620, 4561607, 4561062, 4561063] into pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release
Change-Id: I942819b1703ed98153db9310bb4eeb9d81ddf3ee
-rw-r--r-- | src/com/android/services/telephony/DisconnectCauseUtil.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java index dd0f41604..f725c4926 100644 --- a/src/com/android/services/telephony/DisconnectCauseUtil.java +++ b/src/com/android/services/telephony/DisconnectCauseUtil.java @@ -155,6 +155,7 @@ public class DisconnectCauseUtil { case android.telephony.DisconnectCause.IMEI_NOT_ACCEPTED: case android.telephony.DisconnectCause.WIFI_LOST: case android.telephony.DisconnectCause.IMS_ACCESS_BLOCKED: + case android.telephony.DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL: return DisconnectCause.ERROR; case android.telephony.DisconnectCause.DIALED_MMI: @@ -289,6 +290,10 @@ public class DisconnectCauseUtil { resourceId = R.string.callFailed_data_limit_reached; break; + case android.telephony.DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL: + resourceId = R.string.incall_error_power_off; + break; + default: break; } @@ -653,6 +658,10 @@ public class DisconnectCauseUtil { resourceId = R.string.callFailed_wifi_lost; break; + case android.telephony.DisconnectCause.IMS_SIP_ALTERNATE_EMERGENCY_CALL: + resourceId = R.string.incall_error_power_off; + break; + default: break; } |