Merge "Add CallAudioState ctor as TestApi"

am: 39ac9ffe27

Change-Id: I7ecc3c81927b58bddb5ae12f254be0c09133672a
This commit is contained in:
Hall Liu
2018-05-30 15:09:21 -07:00
committed by android-build-merger
2 changed files with 10 additions and 0 deletions

View File

@@ -426,6 +426,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 {

View File

@@ -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,