summaryrefslogtreecommitdiff
path: root/src/com/android/soundrecorder/SoundRecorder.java
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-03-05 14:33:39 -0800
committerGloria Wang <gwang@google.com>2010-03-05 15:23:08 -0800
commit9a879fc7b23550a6b1d84535df02528ed0f49f27 (patch)
tree240658e42d6f650308d53b66380b1fc8b501ac41 /src/com/android/soundrecorder/SoundRecorder.java
parent8578fe30d63a2f8e79764987e48a6570771b7c79 (diff)
downloadSoundRecorder-9a879fc7b23550a6b1d84535df02528ed0f49f27.tar.gz
Allow content of type */* in SoundRecorder, and use 3GPP as the default format.
Fix for bug 2370421.
Diffstat (limited to 'src/com/android/soundrecorder/SoundRecorder.java')
-rw-r--r--src/com/android/soundrecorder/SoundRecorder.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/soundrecorder/SoundRecorder.java b/src/com/android/soundrecorder/SoundRecorder.java
index dbcb422..a138625 100644
--- a/src/com/android/soundrecorder/SoundRecorder.java
+++ b/src/com/android/soundrecorder/SoundRecorder.java
@@ -186,6 +186,7 @@ public class SoundRecorder extends Activity
static final String AUDIO_3GPP = "audio/3gpp";
static final String AUDIO_AMR = "audio/amr";
static final String AUDIO_ANY = "audio/*";
+ static final String ANY_ANY = "*/*";
static final int BITRATE_AMR = 5900; // bits/sec
static final int BITRATE_3GPP = 5900;
@@ -230,7 +231,8 @@ public class SoundRecorder extends Activity
Intent i = getIntent();
if (i != null) {
String s = i.getType();
- if (AUDIO_AMR.equals(s) || AUDIO_3GPP.equals(s) || AUDIO_ANY.equals(s)) {
+ if (AUDIO_AMR.equals(s) || AUDIO_3GPP.equals(s) || AUDIO_ANY.equals(s)
+ || ANY_ANY.equals(s)) {
mRequestedType = s;
} else if (s != null) {
// we only support amr and 3gpp formats right now
@@ -244,7 +246,7 @@ public class SoundRecorder extends Activity
mMaxFileSize = i.getLongExtra(EXTRA_MAX_BYTES, -1);
}
- if (AUDIO_ANY.equals(mRequestedType)) {
+ if (AUDIO_ANY.equals(mRequestedType) || ANY_ANY.equals(mRequestedType)) {
mRequestedType = AUDIO_3GPP;
}