Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3752e72 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "AudioTrack: Fix track creation of 9.1.4 and 9.1.6 streams" into... 

Merge "AudioTrack: Fix track creation of 9.1.4 and 9.1.6 streams" into sc-v2-dev am: f79e4253 am: fdc8a891

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15999419

Change-Id: I100353e99113c5c9a286f7f705d7c43ded77d8c2
parents 81d4f343 fdc8a891

media/java/android/media/AudioTrack.java

+5 −1
Original line number Diff line number Diff line
@@ -1613,7 +1613,9 @@ public class AudioTrack extends PlayerBase 
            AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_LEFT |

            AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_CENTER |

            AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_RIGHT |

            AudioFormat.CHANNEL_OUT_LOW_FREQUENCY_2;

            AudioFormat.CHANNEL_OUT_LOW_FREQUENCY_2 |

            AudioFormat.CHANNEL_OUT_FRONT_WIDE_LEFT |

            AudioFormat.CHANNEL_OUT_FRONT_WIDE_RIGHT;



    // Returns a boolean whether the attributes, format, bufferSizeInBytes, mode allow

    // power saving to be automatically enabled for an AudioTrack. Returns false if
@@ -1787,6 +1789,8 @@ public class AudioTrack extends PlayerBase 
                | AudioFormat.CHANNEL_OUT_TOP_SIDE_RIGHT);

        put("bottom front", AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_LEFT

                | AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_RIGHT);

        put("front wide", AudioFormat.CHANNEL_OUT_FRONT_WIDE_LEFT

                | AudioFormat.CHANNEL_OUT_FRONT_WIDE_RIGHT);

    }};



    /**