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

Commit b5e999f3 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Add CallAudioState ctor as TestApi" into pi-dev

am: 785a93f6

Change-Id: If94faceaaa98479c7406d2f6f0374d97ca4e706b
parents 82a87674 785a93f6
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -897,6 +897,14 @@ package android.service.quicksettings {

}

package android.telecom {

  public final class CallAudioState implements android.os.Parcelable {
    ctor public CallAudioState(boolean, int, int, android.bluetooth.BluetoothDevice, java.util.Collection<android.bluetooth.BluetoothDevice>);
  }

}

package android.telephony {

  public class MbmsDownloadSession implements java.lang.AutoCloseable {
+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.telecom;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.TestApi;
import android.bluetooth.BluetoothDevice;
import android.os.Parcel;
import android.os.Parcelable;
@@ -100,6 +101,7 @@ public final class CallAudioState implements Parcelable {
    }

    /** @hide */
    @TestApi
    public CallAudioState(boolean isMuted, @CallAudioRoute int route,
            @CallAudioRoute int supportedRouteMask,
            @Nullable BluetoothDevice activeBluetoothDevice,