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

2012-03-27 15:29:53 -07:00
parent 5b8fd25029 fb982db410
commit b1049210ae
1 changed files with 1 additions and 1 deletions
--- a/voip/java/android/net/rtp/AudioStream.java
+++ b/voip/java/android/net/rtp/AudioStream.java
@@ -158,7 +158,7 @@ public class AudioStream extends RtpStream {
            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");
            }
        }