commit d91714fb37771c4e1386236f9d2707573d96ba67
author Chia-chi Yeh <chiachi@android.com> Tue Mar 27 15:29:53 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 15:29:53 2012 -0700
tree 0d2c819d50d29da9d4a814ebb962912e09a4f8e0
parent c30207630321a215ae87e34f4ac4516274755959
parent a7857fbfdfccacb95306e32511f57f1a017b0e31

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

java/android/net/rtp/AudioStream.java

diff --git a/java/android/net/rtp/AudioStream.java b/java/android/net/rtp/AudioStream.java
index d761214..b7874f7 100644
--- a/java/android/net/rtp/AudioStream.java
+++ b/java/android/net/rtp/AudioStream.java
@@ -158,7 +158,7 @@
             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");
             }
         }