From 5f1fb3439d16356b6c956a1e86308a1b04483c5c Mon Sep 17 00:00:00 2001 From: Stephen Bird Date: Mon, 2 May 2016 15:24:10 -0700 Subject: NPE: Make sure clients have a credit warning Change-Id: Id9e9aaaef0928dbeb1d3248d5855149f9e5cb0b3 Ticket: CD-609 --- .../com/android/phone/common/incall/api/InCallResults.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src-ambient/com/android/phone/common/incall/api/InCallResults.java b/src-ambient/com/android/phone/common/incall/api/InCallResults.java index 63655c3..a0286df 100644 --- a/src-ambient/com/android/phone/common/incall/api/InCallResults.java +++ b/src-ambient/com/android/phone/common/incall/api/InCallResults.java @@ -259,12 +259,16 @@ public class InCallResults extends ApiHelper { private static void gotCreditWarn(CallMethodInfo callMethodInfo, Bundle bundle) { Object creditWarn = bundle.get(NudgeKey.INCALL_PARAM_CREDIT_WARN); - if (creditWarn.getClass().equals(Integer.class)) { - callMethodInfo.mCreditWarn = (Integer) creditWarn; - } else if (creditWarn.getClass().equals(Float.class)) { - callMethodInfo.mCreditWarn = (Float) creditWarn; + if (creditWarn != null) { + if (creditWarn.getClass().equals(Integer.class)) { + callMethodInfo.mCreditWarn = (Integer) creditWarn; + } else if (creditWarn.getClass().equals(Float.class)) { + callMethodInfo.mCreditWarn = (Float) creditWarn; + } else { + Log.e(TAG, "Invalid value for Credit Warn limit: " + creditWarn); + } } else { - Log.e(TAG, "Invalid value for Credit Warn limit: " + creditWarn); + Log.e(TAG, "No credit warn limit"); } } -- cgit v1.2.3