Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 785a93f61a

Change-Id: If94faceaaa98479c7406d2f6f0374d97ca4e706b
This commit is contained in:
Hall Liu
2018-05-14 14:27:34 -07:00
committed by android-build-merger
parent 82a87674ce 785a93f61a
commit b5e999f3fd
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/test-current.txt
View File

@@ -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
telecomm/java/android/telecom/CallAudioState.java
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,