Merge "RTP: add a null-check in AudioStream.setDtmfType()."

Chia-chi Yeh · Android (Google) Code Review · commit b1049210ae4a · 2012-03-27T15:29:53.000-07:00
diff --git a/voip/java/android/net/rtp/AudioStream.java b/voip/java/android/net/rtp/AudioStream.java
@@ -158,7 +158,7 @@ public void setDtmfType(int type) {
             if (type < 96 || type > 127) {
                 throw new IllegalArgumentException("Invalid type");
             }
-            if (type == mCodec.type) {
+            if (mCodec != null && type == mCodec.type) {
                 throw new IllegalArgumentException("The type is used by codec");
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public void setDtmfType(int type) {`
`158`	`158`	`if (type < 96 \|\| type > 127) {`
`159`	`159`	`throw new IllegalArgumentException("Invalid type");`
`160`	`160`	`}`
`161`		`- if (type == mCodec.type) {`
	`161`	`+ if (mCodec != null && type == mCodec.type) {`
`162`	`162`	`throw new IllegalArgumentException("The type is used by codec");`
`163`	`163`	`}`
`164`	`164`	`}`