From aeffc933e9ba10c2374098cbb69daa58e79331ad Mon Sep 17 00:00:00 2001
From: John Wang <johnwang@google.com>
Date: Thu, 19 Jul 2012 18:08:55 -0700
Subject: [PATCH] Don't send terminal response without cmd details.

bug:6481578
Change-Id: Ie9f6e33c49307ddd884015a400f90e5477cc551e
---
 .../java/com/android/internal/telephony/cat/CatService.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/telephony/java/com/android/internal/telephony/cat/CatService.java b/telephony/java/com/android/internal/telephony/cat/CatService.java
index 2b370729085d7..17574ce06ee85 100644
--- a/telephony/java/com/android/internal/telephony/cat/CatService.java
+++ b/telephony/java/com/android/internal/telephony/cat/CatService.java
@@ -169,8 +169,11 @@ public class CatService extends Handler implements AppInterface {
             } catch (ClassCastException e) {
                 // for error handling : cast exception
                 CatLog.d(this, "Fail to parse proactive command");
-                sendTerminalResponse(mCurrntCmd.mCmdDet, ResultCode.CMD_DATA_NOT_UNDERSTOOD,
+                // Don't send Terminal Resp if command detail is not available
+                if (mCurrntCmd != null) {
+                    sendTerminalResponse(mCurrntCmd.mCmdDet, ResultCode.CMD_DATA_NOT_UNDERSTOOD,
                                      false, 0x00, null);
+                }
                 break;
             }
             if (cmdParams != null) {