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

Commit bdb2dafe authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Automerger Merge Worker
Browse files

Merge "Allow for internal types in @hide API" into tm-dev am: cc3898c6 

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



Change-Id: I27dfddc4541d5f47a072a41edafb7800a3c011cd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5d28d283 cc3898c6

media/java/android/media/AudioManager.java

+2 −8
Original line number Diff line number Diff line
@@ -5898,14 +5898,8 @@ public class AudioManager { 
     */

    @UnsupportedAppUsage

    @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING)

    public void setWiredDeviceConnectionState(int device, int state, String address,

            String name) {

        final IAudioService service = getService();

        int role = isOutputDevice(device)

                ? AudioDeviceAttributes.ROLE_OUTPUT : AudioDeviceAttributes.ROLE_INPUT;

        AudioDeviceAttributes attributes = new AudioDeviceAttributes(

                role, AudioDeviceInfo.convertInternalDeviceToDeviceType(device), address,

                name, new ArrayList<>()/*mAudioProfiles*/, new ArrayList<>()/*mAudioDescriptors*/);

    public void setWiredDeviceConnectionState(int device, int state, String address, String name) {

        AudioDeviceAttributes attributes = new AudioDeviceAttributes(device, address, name);

        setWiredDeviceConnectionState(attributes, state);

    }