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

Commit 1c22f1d7 authored by Eric Laurent's avatar Eric Laurent Committed by android-build-merger
Browse files

Merge "AudioSystem: Add missing DEVICE_USB_HEADSET to DEVICE_USB_ALL" into oc-dr1-dev 

am: e2e01f77

Change-Id: Ie80f463b6f84c2a5d543c3afd2f3fe5f3bc6c57c
parents 44e61260 e2e01f77

media/java/android/media/AudioSystem.java

+4 −2
Original line number Diff line number Diff line
@@ -424,7 +424,8 @@ public class AudioSystem 
                                                  DEVICE_OUT_BLUETOOTH_SCO_HEADSET |

                                                  DEVICE_OUT_BLUETOOTH_SCO_CARKIT);

    public static final int DEVICE_OUT_ALL_USB = (DEVICE_OUT_USB_ACCESSORY |

                                                  DEVICE_OUT_USB_DEVICE);

                                                  DEVICE_OUT_USB_DEVICE |

                                                  DEVICE_OUT_USB_HEADSET);

    public static final int DEVICE_OUT_ALL_HDMI_SYSTEM_AUDIO = (DEVICE_OUT_AUX_LINE |

                                                                DEVICE_OUT_HDMI_ARC |

                                                                DEVICE_OUT_SPDIF);
@@ -486,7 +487,8 @@ public class AudioSystem 
                                             DEVICE_IN_DEFAULT);

    public static final int DEVICE_IN_ALL_SCO = DEVICE_IN_BLUETOOTH_SCO_HEADSET;

    public static final int DEVICE_IN_ALL_USB = (DEVICE_IN_USB_ACCESSORY |

                                                 DEVICE_IN_USB_DEVICE);

                                                 DEVICE_IN_USB_DEVICE |

                                                 DEVICE_IN_USB_HEADSET);



    // device states, must match AudioSystem::device_connection_state

    public static final int DEVICE_STATE_UNAVAILABLE = 0;