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

Commit 6919452a authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Automerger Merge Worker
Browse files

Merge "Module API for BluetoothProfileConnectionInfo for BLE with volume" am:...

Merge "Module API for BluetoothProfileConnectionInfo for BLE with volume" am: ec3e31bc am: 084cf13a am: 9c23ef99

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



Change-Id: I9a435624f21608afdcfb492f5dfcb28b1ba520b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ded8469 9c23ef99
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ package android.media {
    method @NonNull public static android.media.BluetoothProfileConnectionInfo createA2dpSinkInfo(int);
    method @NonNull public static android.media.BluetoothProfileConnectionInfo createHearingAidInfo(boolean);
    method @NonNull public static android.media.BluetoothProfileConnectionInfo createLeAudioInfo(boolean, boolean);
    method @NonNull public static android.media.BluetoothProfileConnectionInfo createLeAudioOutputInfo(boolean, int);
    method public int describeContents();
    method public int getProfile();
    method public int getVolume();
+0 −1
Original line number Diff line number Diff line
@@ -126,7 +126,6 @@ public final class BluetoothProfileConnectionInfo implements Parcelable {
    }

    /**
     * @hide
     * Factory method for <code>BluetoothProfileConnectionInfo</code> for an LE output device
     * @param suppressNoisyIntent if true the {@link AudioManager.ACTION_AUDIO_BECOMING_NOISY}
     *     intent will not be sent.