diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-04 14:54:10 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-04 14:54:10 +0000 |
| commit | 137ad44175489e62a41ec5441936676fa750432c (patch) | |
| tree | 276720f72a74d739bda5df47edb9aa30759041fd | |
| parent | eebf7b3c068f7dc37ae6c57c591c70b649189bc2 (diff) | |
| parent | 02b6851b7ff4303e16dcb03a6413d54444648ac2 (diff) | |
| download | ims-platform-tools-34.0.5.tar.gz | |
Snap for 10900817 from 02b6851b7ff4303e16dcb03a6413d54444648ac2 to sdk-releaseplatform-tools-34.0.5
Change-Id: I8565283843ff6c6a3ae3bd64b7eb0ea922103ae7
| -rw-r--r-- | OWNERS | 1 | ||||
| -rwxr-xr-x | src/java/com/android/ims/ImsCall.java | 6 | ||||
| -rw-r--r-- | src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java | 3 |
3 files changed, 5 insertions, 5 deletions
@@ -1,6 +1,5 @@ breadley@google.com tgunn@google.com -chinmayd@google.com xiaotonj@google.com tjstuart@google.com grantmenke@google.com diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index 06230a16..a2e07a56 100755 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -2508,7 +2508,11 @@ public class ImsCall implements ICall { setCallProfile(updatedProfile); // Apply the new mediaProfile on top of the Call Profile so it is not ignored in // case the ImsService has not had a chance to update it yet. - mCallProfile.mMediaProfile.copyFrom(profile); + if( mCallProfile != null && mCallProfile.mMediaProfile != null) { + mCallProfile.mMediaProfile.copyFrom(profile); + } else { + logi("Call was closed already, skip updating CallProfile"); + } } if (listener != null) { diff --git a/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java b/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java index b824aa08..91904a66 100644 --- a/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java +++ b/src/java/com/android/ims/rcs/uce/presence/publish/DeviceCapabilityListener.java @@ -343,9 +343,6 @@ public class DeviceCapabilityListener { private void unregisterImsProvisionCallback() { logd("unregisterImsProvisionCallback"); - // Clear the registering IMS callback message from the handler thread - mHandler.removeRegisterImsContentChangedMessage(); - // Unregister mmtel callback if (mImsMmTelManager != null) { try { |