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