From 896a7f5fee46c24d31e9403abdf5813e4bb84ca5 Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Thu, 18 Jul 2013 17:08:21 -0700 Subject: [PATCH] Clean up throws in AudioRecord and AudioTrack Remove dead assignments to member fields in constructor prior to throw. Execution doesn't continue execution, so no need to initialize fields. throw doesn't need parentheses. Fix indentation. Change-Id: I2bf1b8bfa2c836e53a41eea67552cba40dc6fd43 --- media/java/android/media/AudioRecord.java | 33 +++++++++++++------------------ media/java/android/media/AudioTrack.java | 18 +++++------------ 2 files changed, 19 insertions(+), 32 deletions(-) diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java index be7c3b85bcfb..d35c17c13acb 100644 --- a/media/java/android/media/AudioRecord.java +++ b/media/java/android/media/AudioRecord.java @@ -256,19 +256,17 @@ public class AudioRecord // audio source if ( (audioSource < MediaRecorder.AudioSource.DEFAULT) || (audioSource > MediaRecorder.getAudioSourceMax()) ) { - throw (new IllegalArgumentException("Invalid audio source.")); - } else { - mRecordSource = audioSource; + throw new IllegalArgumentException("Invalid audio source."); } + mRecordSource = audioSource; //-------------- // sample rate if ( (sampleRateInHz < 4000) || (sampleRateInHz > 48000) ) { - throw (new IllegalArgumentException(sampleRateInHz - + "Hz is not a supported sample rate.")); - } else { - mSampleRate = sampleRateInHz; + throw new IllegalArgumentException(sampleRateInHz + + "Hz is not a supported sample rate."); } + mSampleRate = sampleRateInHz; //-------------- // channel config @@ -289,9 +287,7 @@ public class AudioRecord mChannelMask = channelConfig; break; default: - mChannelCount = 0; - mChannelMask = AudioFormat.CHANNEL_INVALID; - throw (new IllegalArgumentException("Unsupported channel configuration.")); + throw new IllegalArgumentException("Unsupported channel configuration."); } //-------------- @@ -305,9 +301,8 @@ public class AudioRecord mAudioFormat = audioFormat; break; default: - mAudioFormat = AudioFormat.ENCODING_INVALID; - throw (new IllegalArgumentException("Unsupported sample encoding." - + " Should be ENCODING_PCM_8BIT or ENCODING_PCM_16BIT.")); + throw new IllegalArgumentException("Unsupported sample encoding." + + " Should be ENCODING_PCM_8BIT or ENCODING_PCM_16BIT."); } } @@ -324,7 +319,7 @@ public class AudioRecord int frameSizeInBytes = mChannelCount * (mAudioFormat == AudioFormat.ENCODING_PCM_8BIT ? 1 : 2); if ((audioBufferSize % frameSizeInBytes != 0) || (audioBufferSize < 1)) { - throw (new IllegalArgumentException("Invalid audio buffer size.")); + throw new IllegalArgumentException("Invalid audio buffer size."); } mNativeBufferSizeInBytes = audioBufferSize; @@ -509,8 +504,8 @@ public class AudioRecord public void startRecording() throws IllegalStateException { if (mState != STATE_INITIALIZED) { - throw(new IllegalStateException("startRecording() called on an " - +"uninitialized AudioRecord.")); + throw new IllegalStateException("startRecording() called on an " + + "uninitialized AudioRecord."); } // start recording @@ -531,8 +526,8 @@ public class AudioRecord public void startRecording(MediaSyncEvent syncEvent) throws IllegalStateException { if (mState != STATE_INITIALIZED) { - throw(new IllegalStateException("startRecording() called on an " - +"uninitialized AudioRecord.")); + throw new IllegalStateException("startRecording() called on an " + + "uninitialized AudioRecord."); } // start recording @@ -550,7 +545,7 @@ public class AudioRecord public void stop() throws IllegalStateException { if (mState != STATE_INITIALIZED) { - throw(new IllegalStateException("stop() called on an uninitialized AudioRecord.")); + throw new IllegalStateException("stop() called on an uninitialized AudioRecord."); } // stop recording diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index 73227161f3cb..c8dffcd1f626 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -371,18 +371,16 @@ public class AudioTrack && (streamType != AudioManager.STREAM_BLUETOOTH_SCO) && (streamType != AudioManager.STREAM_DTMF)) { throw new IllegalArgumentException("Invalid stream type."); - } else { - mStreamType = streamType; } + mStreamType = streamType; //-------------- // sample rate, note these values are subject to change if ( (sampleRateInHz < 4000) || (sampleRateInHz > 48000) ) { throw new IllegalArgumentException(sampleRateInHz + "Hz is not a supported sample rate."); - } else { - mSampleRate = sampleRateInHz; } + mSampleRate = sampleRateInHz; //-------------- // channel config @@ -403,14 +401,10 @@ public class AudioTrack default: if (!isMultichannelConfigSupported(channelConfig)) { // input channel configuration features unsupported channels - mChannelCount = 0; - mChannels = AudioFormat.CHANNEL_INVALID; - mChannelConfiguration = AudioFormat.CHANNEL_INVALID; throw new IllegalArgumentException("Unsupported channel configuration."); - } else { - mChannels = channelConfig; - mChannelCount = Integer.bitCount(channelConfig); } + mChannels = channelConfig; + mChannelCount = Integer.bitCount(channelConfig); } //-------------- @@ -424,7 +418,6 @@ public class AudioTrack mAudioFormat = audioFormat; break; default: - mAudioFormat = AudioFormat.ENCODING_INVALID; throw new IllegalArgumentException("Unsupported sample encoding." + " Should be ENCODING_PCM_8BIT or ENCODING_PCM_16BIT."); } @@ -433,9 +426,8 @@ public class AudioTrack // audio load mode if ( (mode != MODE_STREAM) && (mode != MODE_STATIC) ) { throw new IllegalArgumentException("Invalid mode."); - } else { - mDataLoadMode = mode; } + mDataLoadMode = mode; } /** -- 2.11.0