diff options
Diffstat (limited to 'media/java')
-rw-r--r-- | media/java/android/media/AudioManager.java | 12 | ||||
-rw-r--r-- | media/java/android/media/AudioSystem.java | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 270c88f..ee17bd3 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -2474,8 +2474,16 @@ public class AudioManager { * or null if there is no value for that key. */ public String getProperty(String key) { - // implementation to be written - return null; + if (PROPERTY_OUTPUT_SAMPLE_RATE.equals(key)) { + int outputSampleRate = AudioSystem.getPrimaryOutputSamplingRate(); + return outputSampleRate > 0 ? Integer.toString(outputSampleRate) : null; + } else if (PROPERTY_OUTPUT_FRAMES_PER_BUFFER.equals(key)) { + int outputFramesPerBuffer = AudioSystem.getPrimaryOutputFrameCount(); + return outputFramesPerBuffer > 0 ? Integer.toString(outputFramesPerBuffer) : null; + } else { + // null or unknown key + return null; + } } } diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java index 129e84f..2cff4ff 100644 --- a/media/java/android/media/AudioSystem.java +++ b/media/java/android/media/AudioSystem.java @@ -381,4 +381,9 @@ public class AudioSystem public static native int setMasterMute(boolean mute); public static native boolean getMasterMute(); public static native int getDevicesForStream(int stream); + + // helpers for android.media.AudioManager.getProperty(), see description there for meaning + public static native int getPrimaryOutputSamplingRate(); + public static native int getPrimaryOutputFrameCount(); + } |