diff options
| author | Eric Laurent <elaurent@google.com> | 2014-09-09 01:58:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-09 01:59:00 +0000 |
| commit | 7c36c8634287f6bd16e1e0efd117911868759a70 (patch) | |
| tree | 8c7281af93770e108219ab066223e2b5e78d9ca0 /media/java | |
| parent | 36f32f1b97b7437c50bd0a71d7c2ebd5bcd8c2ae (diff) | |
| parent | 56340fc2e87985fb3d396b63b28168bf57ebe7ce (diff) | |
| download | frameworks_base-7c36c8634287f6bd16e1e0efd117911868759a70.zip frameworks_base-7c36c8634287f6bd16e1e0efd117911868759a70.tar.gz frameworks_base-7c36c8634287f6bd16e1e0efd117911868759a70.tar.bz2 | |
Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev
Diffstat (limited to 'media/java')
| -rw-r--r-- | media/java/android/media/AudioAttributes.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/java/android/media/AudioAttributes.java b/media/java/android/media/AudioAttributes.java index 9b644f4..d7ede34 100644 --- a/media/java/android/media/AudioAttributes.java +++ b/media/java/android/media/AudioAttributes.java @@ -162,16 +162,13 @@ public final class AudioAttributes implements Parcelable { public final static int FLAG_BEACON = 0x1 << 3; /** - * @hide - * CANDIDATE FOR PUBLIC API * Flag requesting the use of an output stream supporting hardware A/V synchronization. */ - // TODO add in FLAG_ALL_PUBLIC when in public API public final static int FLAG_HW_AV_SYNC = 0x1 << 4; private final static int FLAG_ALL = FLAG_AUDIBILITY_ENFORCED | FLAG_SECURE | FLAG_SCO | FLAG_BEACON | FLAG_HW_AV_SYNC; - private final static int FLAG_ALL_PUBLIC = FLAG_AUDIBILITY_ENFORCED; + private final static int FLAG_ALL_PUBLIC = FLAG_AUDIBILITY_ENFORCED | FLAG_HW_AV_SYNC; private int mUsage = USAGE_UNKNOWN; private int mContentType = CONTENT_TYPE_UNKNOWN; |