diff options
| author | Suresh Kumar Sugguna <sureshk@codeaurora.org> | 2015-11-30 16:55:44 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-05-20 23:09:07 -0700 |
| commit | 4b927d1b9621202285a82d0158f323549f35a950 (patch) | |
| tree | 6a0fa84a0a878410f567bca8a23941af5edcb150 | |
| parent | 8d38569e4eac7e0aaaa6f31924758a6087fe1f5e (diff) | |
| download | android_frameworks_opt_telephony-4b927d1b9621202285a82d0158f323549f35a950.tar.gz android_frameworks_opt_telephony-4b927d1b9621202285a82d0158f323549f35a950.tar.bz2 android_frameworks_opt_telephony-4b927d1b9621202285a82d0158f323549f35a950.zip | |
IMS: handle exception for an invalid service class
When an invalid service class is dialed via MMI code,
catch the runtime exception and return as unsupported.
Change-Id: I5f6911da30fc0300e7324e81f2d5dcb4ce1ae20a
CRs-Fixed: 945027
| -rw-r--r-- | src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java index 34b203767..1549983c4 100644 --- a/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java +++ b/src/java/com/android/internal/telephony/imsphone/ImsPhoneMmiCode.java @@ -698,12 +698,16 @@ public final class ImsPhoneMmiCode extends Handler implements MmiCode { || (mSc != null && mSc.equals(SC_BS_MT)) || (mSc != null && mSc.equals(SC_BAICa))) { - int serviceClass = siToServiceClass(mSib); - if (serviceClass != SERVICE_CLASS_NONE - && serviceClass != SERVICE_CLASS_VOICE) { - return false; + try { + int serviceClass = siToServiceClass(mSib); + if (serviceClass != SERVICE_CLASS_NONE + && serviceClass != SERVICE_CLASS_VOICE) { + return false; + } + return true; + } catch (RuntimeException exc) { + Rlog.d(LOG_TAG, "Invalid service class " + exc); } - return true; } else if (isPinPukCommand() || (mSc != null && (mSc.equals(SC_PWD) || mSc.equals(SC_CLIP) || mSc.equals(SC_CLIR)))) { |