summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media/java/android/media/AudioRecord.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java
index c9cdbb0ed277..6570aabf8e2d 100644
--- a/media/java/android/media/AudioRecord.java
+++ b/media/java/android/media/AudioRecord.java
@@ -165,6 +165,7 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection,
//--------------------
/**
* Accessed by native methods: provides access to C++ AudioRecord object
+ * Is 0 after release()
*/
@SuppressWarnings("unused")
@UnsupportedAppUsage
@@ -1863,7 +1864,11 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection,
if (mNativeRecorderInJavaObj == 0) {
return 0;
}
- return native_getPortId();
+ try {
+ return native_getPortId();
+ } catch (IllegalStateException e) {
+ return 0;
+ }
}
//--------------------------------------------------------------------------
@@ -2046,6 +2051,9 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection,
private native final int native_get_active_microphones(
ArrayList<MicrophoneInfo> activeMicrophones);
+ /**
+ * @throws IllegalStateException
+ */
private native int native_getPortId();
private native int native_set_preferred_microphone_direction(int direction);