diff options
author | Justin Klaassen <justinklaassen@google.com> | 2018-04-15 00:41:15 -0400 |
---|---|---|
committer | Justin Klaassen <justinklaassen@google.com> | 2018-04-15 00:41:15 -0400 |
commit | b8042fc9b036db0a6692ca853428fc6ab1e60892 (patch) | |
tree | 82669ea5d75238758e22d379a42baeada526219e /android/telecom | |
parent | 4d01eeaffaa720e4458a118baa137a11614f00f7 (diff) | |
download | android-28-b8042fc9b036db0a6692ca853428fc6ab1e60892.tar.gz |
Import Android SDK Platform P [4719250]HEADmastermainandroidx-work-releaseandroidx-webkit-releaseandroidx-viewpager2-releaseandroidx-versionedparcelable-releaseandroidx-vectordrawable-releaseandroidx-transition-releaseandroidx-sqlite-releaseandroidx-sharetarget-releaseandroidx-security-security-crypto-releaseandroidx-savedstate-releaseandroidx-room-releaseandroidx-recyclerview-releaseandroidx-recyclerview-recyclerview-selection-releaseandroidx-preference-releaseandroidx-paging-releaseandroidx-paging-legacy-releaseandroidx-navigation-releaseandroidx-mediarouter-releaseandroidx-media2-releaseandroidx-media2-media2-widget-releaseandroidx-media-releaseandroidx-master-releaseandroidx-localbroadcastmanager-releaseandroidx-loader-releaseandroidx-lifecycle-releaseandroidx-jetifier-releaseandroidx-g3-releaseandroidx-fragment-releaseandroidx-exifinterface-releaseandroidx-enterprise-releaseandroidx-core-releaseandroidx-core-core-role-releaseandroidx-coordinatorlayout-releaseandroidx-concurrent-releaseandroidx-compose-releaseandroidx-collection-releaseandroidx-camerax-releaseandroidx-browser-releaseandroidx-biometric-releaseandroidx-benchmark-releaseandroidx-autofill-releaseandroidx-arch-core-releaseandroidx-appcompat-releaseandroidx-annotation-releaseandroidx-annotation-annotation-experimental-releaseandroidx-activity-releaseandroid-arch-work-releaseandroid-arch-navigation-release
/google/data/ro/projects/android/fetch_artifact \
--bid 4719250 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4719250.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: I9ec0a12c9251b8449dba0d86b0cfdbcca16b0a7c
Diffstat (limited to 'android/telecom')
-rw-r--r-- | android/telecom/Connection.java | 11 | ||||
-rw-r--r-- | android/telecom/InCallService.java | 7 | ||||
-rw-r--r-- | android/telecom/PhoneAccount.java | 3 |
3 files changed, 11 insertions, 10 deletions
diff --git a/android/telecom/Connection.java b/android/telecom/Connection.java index 36333e44..3bf951d4 100644 --- a/android/telecom/Connection.java +++ b/android/telecom/Connection.java @@ -2600,7 +2600,6 @@ public abstract class Connection extends Conferenceable { } /** - * * Request audio routing to a specific bluetooth device. Calling this method may result in * the device routing audio to a different bluetooth device than the one specified if the * bluetooth stack is unable to route audio to the requested device. @@ -2611,13 +2610,13 @@ public abstract class Connection extends Conferenceable { * Used by self-managed {@link ConnectionService}s which wish to use bluetooth audio for a * self-managed {@link Connection} (see {@link PhoneAccount#CAPABILITY_SELF_MANAGED}.) * <p> - * See also {@link InCallService#requestBluetoothAudio(String)} - * @param bluetoothAddress The address of the bluetooth device to connect to, as returned by - * {@link BluetoothDevice#getAddress()}. + * See also {@link InCallService#requestBluetoothAudio(BluetoothDevice)} + * @param bluetoothDevice The bluetooth device to connect to. */ - public void requestBluetoothAudio(@NonNull String bluetoothAddress) { + public void requestBluetoothAudio(@NonNull BluetoothDevice bluetoothDevice) { for (Listener l : mListeners) { - l.onAudioRouteChanged(this, CallAudioState.ROUTE_BLUETOOTH, bluetoothAddress); + l.onAudioRouteChanged(this, CallAudioState.ROUTE_BLUETOOTH, + bluetoothDevice.getAddress()); } } diff --git a/android/telecom/InCallService.java b/android/telecom/InCallService.java index af65c65a..bd25ab2b 100644 --- a/android/telecom/InCallService.java +++ b/android/telecom/InCallService.java @@ -428,12 +428,11 @@ public abstract class InCallService extends Service { * A list of available devices can be obtained via * {@link CallAudioState#getSupportedBluetoothDevices()} * - * @param bluetoothAddress The address of the bluetooth device to connect to, as returned by - * {@link BluetoothDevice#getAddress()}. + * @param bluetoothDevice The bluetooth device to connect to. */ - public final void requestBluetoothAudio(@NonNull String bluetoothAddress) { + public final void requestBluetoothAudio(@NonNull BluetoothDevice bluetoothDevice) { if (mPhone != null) { - mPhone.requestBluetoothAudio(bluetoothAddress); + mPhone.requestBluetoothAudio(bluetoothDevice.getAddress()); } } diff --git a/android/telecom/PhoneAccount.java b/android/telecom/PhoneAccount.java index 95eb14ad..b3a3bf21 100644 --- a/android/telecom/PhoneAccount.java +++ b/android/telecom/PhoneAccount.java @@ -129,6 +129,9 @@ public final class PhoneAccount implements Parcelable { * <p> * By default, Self-Managed {@link PhoneAccount}s do not log their calls to the call log. * Setting this extra to {@code true} provides a means for them to log their calls. + * <p> + * Note: Only calls where the {@link Call.Details#getHandle()} {@link Uri#getScheme()} is + * {@link #SCHEME_SIP} or {@link #SCHEME_TEL} will be logged at the current time. */ public static final String EXTRA_LOG_SELF_MANAGED_CALLS = "android.telecom.extra.LOG_SELF_MANAGED_CALLS"; |