diff options
author | Brad Ebinger <breadley@google.com> | 2023-12-08 13:37:56 -0800 |
---|---|---|
committer | Brad Ebinger <breadley@google.com> | 2023-12-08 21:46:34 +0000 |
commit | 9558ed5c0a2e0b47bb1a0adc7d51b15048f070a8 (patch) | |
tree | fbfadd10f25d63fdb69e83b5e8c53073668205ff | |
parent | 05c0c644a004d676870833099a095481ca78006d (diff) | |
download | Telecomm-9558ed5c0a2e0b47bb1a0adc7d51b15048f070a8.tar.gz |
Remove NPE in VoipCallTransactionResult
Ensure that if a Call is not provided in VoipCallTransactionResult,
it can not result in an NPE.
Flag: EXEMPT
Fixes: 315517208
Test: atest TelecomUnitTests
Change-Id: I89254c188f7b5edf20b574680a2792f6b96a0c25
-rw-r--r-- | src/com/android/server/telecom/voip/VoipCallTransactionResult.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/server/telecom/voip/VoipCallTransactionResult.java b/src/com/android/server/telecom/voip/VoipCallTransactionResult.java index 2916fc64b..ffc025560 100644 --- a/src/com/android/server/telecom/voip/VoipCallTransactionResult.java +++ b/src/com/android/server/telecom/voip/VoipCallTransactionResult.java @@ -24,13 +24,14 @@ public class VoipCallTransactionResult { public static final int RESULT_SUCCEED = 0; public static final int RESULT_FAILED = 1; - private int mResult; - private String mMessage; - private Call mCall; + private final int mResult; + private final String mMessage; + private final Call mCall; public VoipCallTransactionResult(int result, String message) { mResult = result; mMessage = message; + mCall = null; } public VoipCallTransactionResult(int result, Call call, String message) { @@ -70,7 +71,7 @@ public class VoipCallTransactionResult { append("{ VoipCallTransactionResult: [mResult: "). append(mResult). append("], [mCall: "). - append(mCall.toString()). + append((mCall != null) ? mCall : "null"). append("], [mMessage="). append(mMessage).append("] }").toString(); } |