commit 34b91d6c7f159849dd3949bf506e0b03dc719b71
author Shuo Qian <shuoq@google.com> Fri Jan 08 09:24:47 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 08 09:24:47 2021 +0000
tree 31747dbbf455d8c47bb2da2f4d7b8742c393f612
parent 90ea20b973db015907d21fb505fec4ac91193b02
parent c8a8f749f6cacb6106dd0cab281c88801977341f

Merge "Update the call composer capability if user setting changes in IMS" am: c8a8f749f6

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1540888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I157a110d32366b3cb6eae9c5024c27be84beb0ab

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index a831e94..b8f87ea 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -6536,9 +6536,13 @@
                 if (defaultPhone != null && defaultPhone.getPhoneType() == PHONE_TYPE_IMS) {
                     ImsPhone imsPhone = (ImsPhone) defaultPhone;
                     imsPhone.setCallComposerStatus(status);
+                    ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
+                            .updateImsServiceConfig();
                 }
             }
-        } finally {
+        } catch (ImsException e) {
+            throw new ServiceSpecificException(e.getCode());
+        }  finally {
             Binder.restoreCallingIdentity(identity);
         }
     }