aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoonhunshin <joonhunshin@google.com>2023-07-28 17:37:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-28 17:37:06 +0000
commitbb0b91273f2479cdf0ac632fe0ddc1579c795dce (patch)
tree5025c8f208a0783c34e87f9eebdf8eed6d7c3f8e
parent590e0af93f2f382e6187a27d071a66f181a69ea2 (diff)
parentd09b559755116bcd34a61060d5099d80dc35695e (diff)
downloadims-bb0b91273f2479cdf0ac632fe0ddc1579c795dce.tar.gz
Fixed NullPointException after SRVCC completed event am: 82845c3da7 am: a5ce91ab69 am: ec227a6181 am: d09b559755
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2670519 Change-Id: I089c60fb75111053660b0fc04304924253beaad5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-xsrc/java/com/android/ims/ImsCall.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index 29f6acd4..5fae98e2 100755
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -2538,7 +2538,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) {