From bf321581c30f14567aeef7a1ed4edf75392216cf Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Thu, 18 Sep 2014 11:16:13 -0700 Subject: Add null check for calls in CallList Bug: 17567272 Change-Id: I4e036aa4a586e372b6fa26775c84a4e15f5e5788 --- InCallUI/src/com/android/incallui/TelecomAdapter.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'InCallUI') diff --git a/InCallUI/src/com/android/incallui/TelecomAdapter.java b/InCallUI/src/com/android/incallui/TelecomAdapter.java index 5f32c7e47..62b1bfc83 100644 --- a/InCallUI/src/com/android/incallui/TelecomAdapter.java +++ b/InCallUI/src/com/android/incallui/TelecomAdapter.java @@ -64,12 +64,18 @@ final class TelecomAdapter implements InCallPhoneListener { } private android.telecom.Call getTelecommCallById(String callId) { - return CallList.getInstance().getCallById(callId).getTelecommCall(); + final Call call = CallList.getInstance().getCallById(callId); + return call == null ? null : call.getTelecommCall(); } void answerCall(String callId, int videoState) { if (mPhone != null) { - getTelecommCallById(callId).answer(videoState); + final android.telecom.Call call = getTelecommCallById(callId); + if (call != null) { + call.answer(videoState); + } else { + Log.e(this, "error answerCall, call not in call list: " + callId); + } } else { Log.e(this, "error answerCall, mPhone is null"); } @@ -77,7 +83,12 @@ final class TelecomAdapter implements InCallPhoneListener { void rejectCall(String callId, boolean rejectWithMessage, String message) { if (mPhone != null) { - getTelecommCallById(callId).reject(rejectWithMessage, message); + final android.telecom.Call call = getTelecommCallById(callId); + if (call != null) { + call.reject(rejectWithMessage, message); + } else { + Log.e(this, "error rejectCall, call not in call list: " + callId); + } } else { Log.e(this, "error rejectCall, mPhone is null"); } -- cgit v1.2.3