aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoonhunshin <joonhunshin@google.com>2023-07-28 03:50:53 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-07-28 03:50:53 +0000
commita5ce91ab69ae59cebe8abf1d5a4bfc04f4a810ce (patch)
tree93a89cc5e224f7effc33c8dec5274de264d6be7f
parente8a7e5f9917151aed51659e62c13e5676152cd8f (diff)
parent82845c3da780c14d1852d85ede6ff90aa3c70b1b (diff)
downloadims-a5ce91ab69ae59cebe8abf1d5a4bfc04f4a810ce.tar.gz
Fixed NullPointException after SRVCC completed event am: 82845c3da7
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/2670519 Change-Id: I3f37c87615c539a4dd2aad2a20f929b52a4993a5 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 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) {