summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2015-08-04 20:45:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-04 20:45:18 +0000
commitfc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f (patch)
treedc10c93957b8b5c49476a979fdc1f9e6377b5751 /media
parentce68917c849548d80d9aca14f262d22d9c47c3dc (diff)
parent6d00e41145a577de114f93985bf05d7eca99ccc3 (diff)
downloadframeworks_base-fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f.zip
frameworks_base-fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f.tar.gz
frameworks_base-fc5a4bf0e1520bf3acd75226d760b8e1d7cdd59f.tar.bz2
Merge "AudioService: check for audio device connection success" into mnc-dev
Diffstat (limited to 'media')
-rw-r--r--media/java/android/media/AudioSystem.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index acdadd7..e99a37a 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -604,6 +604,10 @@ public class AudioSystem
public static final int SYNC_EVENT_NONE = 0;
public static final int SYNC_EVENT_PRESENTATION_COMPLETE = 1;
+ /**
+ * @return command completion status, one of {@link #AUDIO_STATUS_OK},
+ * {@link #AUDIO_STATUS_ERROR} or {@link #AUDIO_STATUS_SERVER_DIED}
+ */
public static native int setDeviceConnectionState(int device, int state,
String device_address, String device_name);
public static native int getDeviceConnectionState(int device, String device_address);