diff options
| author | 2018-05-14 14:27:34 -0700 | |
|---|---|---|
| committer | 2018-05-14 14:27:34 -0700 | |
| commit | b5e999f3fd98fb28279b3da19d1755358b58e4b8 (patch) | |
| tree | d83f4bafc77707919be787e1be6d5ca5b41b1967 | |
| parent | 82a87674ce284b9893de533c61d0a0f18bf5b07b (diff) | |
| parent | 785a93f61a2a39611d627ddddceb4cac202ca6da (diff) | |
Merge "Add CallAudioState ctor as TestApi" into pi-dev
am: 785a93f61a
Change-Id: If94faceaaa98479c7406d2f6f0374d97ca4e706b
| -rw-r--r-- | api/test-current.txt | 8 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/CallAudioState.java | 2 |
2 files changed, 10 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index 5cffd0e1b3b7..0fae01194417 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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 { diff --git a/telecomm/java/android/telecom/CallAudioState.java b/telecomm/java/android/telecom/CallAudioState.java index 4b827d2e29a2..e33ba7e3b971 100644 --- a/telecomm/java/android/telecom/CallAudioState.java +++ b/telecomm/java/android/telecom/CallAudioState.java @@ -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, |