diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2012-03-27 15:29:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-27 15:29:53 -0700 |
| commit | b1049210ae4ab1c235abdf28edac8e5c714e4192 (patch) | |
| tree | 335334962b95c352b7c06c4c17b0cfc23343f92a | |
| parent | 5b8fd25029e8b53353f4cdcb7c0dacea294a6b44 (diff) | |
| parent | fb982db41060a2914cddb43200f3ee53627f8762 (diff) | |
| download | frameworks_base-b1049210ae4ab1c235abdf28edac8e5c714e4192.zip frameworks_base-b1049210ae4ab1c235abdf28edac8e5c714e4192.tar.gz frameworks_base-b1049210ae4ab1c235abdf28edac8e5c714e4192.tar.bz2 | |
Merge "RTP: add a null-check in AudioStream.setDtmfType()."
| -rw-r--r-- | voip/java/android/net/rtp/AudioStream.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/voip/java/android/net/rtp/AudioStream.java b/voip/java/android/net/rtp/AudioStream.java index d761214..b7874f7 100644 --- 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"); } } |