summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src-ambient/com/android/phone/common/incall/api/InCallResults.java14
1 files 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");
}
}