diff options
author | Tyler Gunn <tgunn@google.com> | 2020-05-20 14:25:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-05-20 14:25:15 +0000 |
commit | bdb38032ff3a5e52ada9af1beefcf754db589a78 (patch) | |
tree | 282e7c28e4b14d8bad0fc606a0d6d7c87c59fa47 | |
parent | 0c6d28bff9a83bd448d27c31730af4c175d8b036 (diff) | |
parent | f0071532ad6b15e710aa152075bf868ea6e21c3e (diff) | |
download | ims-bdb38032ff3a5e52ada9af1beefcf754db589a78.tar.gz |
Merge "Fix potential NPE when creating an ImsCall." into rvc-dev
-rwxr-xr-x | src/java/com/android/ims/ImsCall.java | 3 | ||||
-rw-r--r-- | src/java/com/android/ims/ImsManager.java | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index 04b1e9cc..a31971d2 100755 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -3672,7 +3672,8 @@ public class ImsCall implements ICall { * @param profile The current {@link ImsCallProfile} for the call. */ private void trackVideoStateHistory(ImsCallProfile profile) { - mWasVideoCall = mWasVideoCall || profile.isVideoCall(); + mWasVideoCall = mWasVideoCall + || profile != null ? profile.isVideoCall() : false; } /** diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java index 7456fa96..f943c966 100644 --- a/src/java/com/android/ims/ImsManager.java +++ b/src/java/com/android/ims/ImsManager.java @@ -1993,6 +1993,7 @@ public class ImsManager implements IFeatureConnector { return call; } catch (Throwable t) { + loge("takeCall caught: ", t); throw new ImsException("takeCall()", t, ImsReasonInfo.CODE_UNSPECIFIED); } } |