Skip to content

Commit bc8bab8

Browse files
Wink SavilleAndroid (Google) Code Review
authored andcommitted
Merge "Don't send terminal response without cmd details." into jb-dev
2 parents 9f061e2 + aeffc93 commit bc8bab8

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

telephony/java/com/android/internal/telephony/cat/CatService.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,11 @@ private void handleRilMsg(RilMessage rilMsg) {
169169
} catch (ClassCastException e) {
170170
// for error handling : cast exception
171171
CatLog.d(this, "Fail to parse proactive command");
172-
sendTerminalResponse(mCurrntCmd.mCmdDet, ResultCode.CMD_DATA_NOT_UNDERSTOOD,
172+
// Don't send Terminal Resp if command detail is not available
173+
if (mCurrntCmd != null) {
174+
sendTerminalResponse(mCurrntCmd.mCmdDet, ResultCode.CMD_DATA_NOT_UNDERSTOOD,
173175
false, 0x00, null);
176+
}
174177
break;
175178
}
176179
if (cmdParams != null) {

0 commit comments

Comments
 (0)