diff options
| author | 2022-03-09 16:28:13 +0000 | |
|---|---|---|
| committer | 2022-03-09 16:28:13 +0000 | |
| commit | febe56da78c5a8acde00598e9ee758dd180f0d65 (patch) | |
| tree | a0eddc867d52cb419c9885cbe00d82c144fed486 | |
| parent | 0eaf43c719cfd5f7aaa285a9d36866139ddcaee3 (diff) | |
| parent | b99333df7d15bd78a4d6135014010d1b34c09f3d (diff) | |
Merge "[API Review] onCreateUnknownConnection" into tm-dev
| -rw-r--r-- | core/api/module-lib-current.txt | 8 | ||||
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rwxr-xr-x | telecomm/java/android/telecom/ConnectionService.java | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index e6cb2402ac3c..7aef9a6b767a 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -455,6 +455,14 @@ package android.provider { } +package android.telecom { + + public abstract class ConnectionService extends android.app.Service { + method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telecom.Connection onCreateUnknownConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.ConnectionRequest); + } + +} + package android.telephony { public abstract class CellSignalStrength { diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 229fd6068721..d28eaae2a9f7 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -12218,7 +12218,6 @@ package android.telecom { public abstract class ConnectionService extends android.app.Service { method public final void addExistingConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.Connection, @NonNull android.telecom.Conference); - method @Nullable @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telecom.Connection onCreateUnknownConnection(@NonNull android.telecom.PhoneAccountHandle, @NonNull android.telecom.ConnectionRequest); } public abstract class InCallService extends android.app.Service { diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 27d423b3bc1e..bce6809ef32d 100755 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -3171,9 +3171,14 @@ public abstract class ConnectionService extends Service { * * {@link TelecomManager#addNewIncomingCall(PhoneAccountHandle, android.os.Bundle)}. * + * @param connectionManagerPhoneAccount The connection manager account to use for managing + * this call + * @param request Details about the outgoing call + * @return The {@code Connection} object to satisfy this call, or the result of an invocation + * of {@link Connection#createFailedConnection(DisconnectCause)} to not handle the call * @hide */ - @SystemApi + @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public @Nullable Connection onCreateUnknownConnection( @NonNull PhoneAccountHandle connectionManagerPhoneAccount, |