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

Merge "Call Screening / Caller ID API Changes"

Browse Source
This commit is contained in:
Tyler Gunn
2019-01-10 19:12:38 +00:00
committed by Android (Google) Code Review
parent c9f60fb4d2 9e76fd19bc
commit d7acc5a49f
7 changed files with 281 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -42662,6 +42662,7 @@ package android.telecom {
method public static java.lang.String capabilitiesToString(int);
method public android.telecom.PhoneAccountHandle getAccountHandle();
method public int getCallCapabilities();
method public int getCallDirection();
method public android.telecom.CallIdentification getCallIdentification();
method public int getCallProperties();
method public java.lang.String getCallerDisplayName();
@@ -42698,6 +42699,9 @@ package android.telecom {
field public static final int CAPABILITY_SUPPORT_DEFLECT = 16777216; // 0x1000000
field public static final int CAPABILITY_SUPPORT_HOLD = 2; // 0x2
field public static final int CAPABILITY_SWAP_CONFERENCE = 8; // 0x8
field public static final int DIRECTION_INCOMING = 0; // 0x0
field public static final int DIRECTION_OUTGOING = 1; // 0x1
field public static final int DIRECTION_UNKNOWN = -1; // 0xffffffff
field public static final int PROPERTY_CONFERENCE = 1; // 0x1
field public static final int PROPERTY_EMERGENCY_CALLBACK_MODE = 4; // 0x4
field public static final int PROPERTY_ENTERPRISE_CALL = 32; // 0x20

50
core/java/android/app/role/RoleManager.java
View File

@@ -66,6 +66,56 @@ public final class RoleManager {
private static final String LOG_TAG = RoleManager.class.getSimpleName();
/**
* The name of the proxy calling role.
* <p>
* A proxy calling app implements the {@link android.telecom.CallRedirectionService} API and
* provides a means to re-write the phone number for an outgoing call to place the call through
* a proxy calling service.
* <p>
* A single app may fill this role at any one time.
* @hide
*/
public static final String ROLE_PROXY_CALLING_APP = "android.app.role.PROXY_CALLING_APP";
/**
* The name of the call screening and caller id role.
* <p>
* A call screening and caller id app implements the
* {@link android.telecom.CallScreeningService} API.
* <p>
* A single app may fill this role at any one time.
* @hide
*/
public static final String ROLE_CALL_SCREENING_APP = "android.app.role.CALL_SCREENING_APP";
/**
* The name of the call companion app role.
* <p>
* A call companion app provides no user interface for calls, but will be bound to by Telecom
* when there are active calls on the device. Companion apps for wearable devices are an
* acceptable use-case. A call companion app implements the
* {@link android.telecom.InCallService} API.
* <p>
* Multiple apps app may fill this role at any one time.
* @hide
*/
public static final String ROLE_CALL_COMPANION_APP = "android.app.role.CALL_COMPANION_APP";
/**
* The name of the car mode dialer app role.
* <p>
* Similar to the {@link #ROLE_DIALER} role, this role determines which app is responsible for
* showing the user interface for ongoing calls on the device. This app filling this role is
* only used when the device is in car mode (see
* {@link android.app.UiModeManager#ACTION_ENTER_CAR_MODE} for more information). An app
* filling this role must implement the {@link android.telecom.InCallService} API.
* <p>
* A single app may fill this role at any one time.
* @hide
*/
public static final String ROLE_CAR_MODE_DIALER_APP = "android.app.role.CAR_MODE_DIALER_APP";
/**
* The name of the dialer role.
*/

46
telecomm/java/android/telecom/Call.java
View File

@@ -239,6 +239,30 @@ public final class Call {
"android.telecom.event.HANDOVER_FAILED";
public static class Details {
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(
prefix = { "DIRECTION_" },
value = {DIRECTION_UNKNOWN, DIRECTION_INCOMING, DIRECTION_OUTGOING})
public @interface CallDirection {}
/**
* Indicates that the call is neither and incoming nor an outgoing call. This can be the
* case for calls reported directly by a {@link ConnectionService} in special cases such as
* call handovers.
*/
public static final int DIRECTION_UNKNOWN = -1;
/**
* Indicates that the call is an incoming call.
*/
public static final int DIRECTION_INCOMING = 0;
/**
* Indicates that the call is an outgoing call.
*/
public static final int DIRECTION_OUTGOING = 1;
/** Call can currently be put on hold or unheld. */
public static final int CAPABILITY_HOLD = 0x00000001;
@@ -519,6 +543,7 @@ public final class Call {
private final Bundle mIntentExtras;
private final long mCreationTimeMillis;
private final CallIdentification mCallIdentification;
private final @CallDirection int mCallDirection;
/**
* Whether the supplied capabilities supports the specified capability.
@@ -838,6 +863,14 @@ public final class Call {
return mCallIdentification;
}
/**
* Indicates whether the call is an incoming or outgoing call.
* @return The call's direction.
*/
public @CallDirection int getCallDirection() {
return mCallDirection;
}
@Override
public boolean equals(Object o) {
if (o instanceof Details) {
@@ -859,7 +892,8 @@ public final class Call {
areBundlesEqual(mExtras, d.mExtras) &&
areBundlesEqual(mIntentExtras, d.mIntentExtras) &&
Objects.equals(mCreationTimeMillis, d.mCreationTimeMillis) &&
Objects.equals(mCallIdentification, d.mCallIdentification);
Objects.equals(mCallIdentification, d.mCallIdentification) &&
Objects.equals(mCallDirection, d.mCallDirection);
}
return false;
}
@@ -881,7 +915,8 @@ public final class Call {
mExtras,
mIntentExtras,
mCreationTimeMillis,
mCallIdentification);
mCallIdentification,
mCallDirection);
}
/** {@hide} */
@@ -902,7 +937,8 @@ public final class Call {
Bundle extras,
Bundle intentExtras,
long creationTimeMillis,
CallIdentification callIdentification) {
CallIdentification callIdentification,
int callDirection) {
mTelecomCallId = telecomCallId;
mHandle = handle;
mHandlePresentation = handlePresentation;
@@ -920,6 +956,7 @@ public final class Call {
mIntentExtras = intentExtras;
mCreationTimeMillis = creationTimeMillis;
mCallIdentification = callIdentification;
mCallDirection = callDirection;
}
/** {@hide} */
@@ -941,7 +978,8 @@ public final class Call {
parcelableCall.getExtras(),
parcelableCall.getIntentExtras(),
parcelableCall.getCreationTimeMillis(),
parcelableCall.getCallIdentification());
parcelableCall.getCallIdentification(),
parcelableCall.getCallDirection());
}
@Override

22
telecomm/java/android/telecom/CallIdentification.java
View File

@@ -250,8 +250,8 @@ public final class CallIdentification implements Parcelable {
mDetails = details;
mPhoto = photo;
mNuisanceConfidence = nuisanceConfidence;
mCallScreeningAppName = callScreeningPackageName;
mCallScreeningPackageName = callScreeningAppName;
mCallScreeningAppName = callScreeningAppName;
mCallScreeningPackageName = callScreeningPackageName;
}
private String mName;
@@ -430,4 +430,22 @@ public final class CallIdentification implements Parcelable {
return Objects.hash(mName, mDescription, mDetails, mPhoto, mNuisanceConfidence,
mCallScreeningAppName, mCallScreeningPackageName);
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("[CallId mName=");
sb.append(Log.pii(mName));
sb.append(", mDesc=");
sb.append(mDescription);
sb.append(", mDet=");
sb.append(mDetails);
sb.append(", conf=");
sb.append(mNuisanceConfidence);
sb.append(", appName=");
sb.append(mCallScreeningAppName);
sb.append(", pkgName=");
sb.append(mCallScreeningPackageName);
return sb.toString();
}
}

62
telecomm/java/android/telecom/CallScreeningService.java
View File

@@ -21,6 +21,7 @@ import android.annotation.SdkConstant;
import android.app.Service;
import android.content.ComponentName;
import android.content.Intent;
import android.net.Uri;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
@@ -33,8 +34,9 @@ import com.android.internal.telecom.ICallScreeningService;
/**
* This service can be implemented by the default dialer (see
* {@link TelecomManager#getDefaultDialerPackage()}) to allow or disallow incoming calls before
* they are shown to a user.
* {@link TelecomManager#getDefaultDialerPackage()}) or a third party app to allow or disallow
* incoming calls before they are shown to a user. This service can also provide
* {@link CallIdentification} information for calls.
* <p>
* Below is an example manifest registration for a {@code CallScreeningService}.
* <pre>
@@ -56,6 +58,34 @@ import com.android.internal.telecom.ICallScreeningService;
* information about a {@link Call.Details call} which will be shown to the user in the
* Dialer app.</li>
* </ol>
* <p>
* <h2>Becoming the {@link CallScreeningService}</h2>
* Telecom will bind to a single app chosen by the user which implements the
* {@link CallScreeningService} API when there are new incoming and outgoing calls.
* <p>
* The code snippet below illustrates how your app can request that it fills the call screening
* role.
* <pre>
* {@code
* private static final int REQUEST_ID = 1;
*
* public void requestRole() {
* RoleManager roleManager = (RoleManager) getSystemService(ROLE_SERVICE);
* Intent intent = roleManager.createRequestRoleIntent("android.app.role.CALL_SCREENING_APP");
* startActivityForResult(intent, REQUEST_ID);
* }
*
* &#64;Override
* public void onActivityResult(int requestCode, int resultCode, Intent data) {
* if (requestCode == REQUEST_ID) {
* if (resultCode == android.app.Activity.RESULT_OK) {
* // Your app is now the call screening app
* } else {
* // Your app is not the call screening app
* }
* }
* }
* </pre>
*/
public abstract class CallScreeningService extends Service {
/**
@@ -222,30 +252,46 @@ public abstract class CallScreeningService extends Service {
}
/**
* Called when a new incoming call is added.
* {@link CallScreeningService#respondToCall(Call.Details, CallScreeningService.CallResponse)}
* should be called to allow or disallow the call.
* Called when a new incoming or outgoing call is added which is not in the user's contact list.
* <p>
* A {@link CallScreeningService} must indicate whether an incoming call is allowed or not by
* calling
* {@link CallScreeningService#respondToCall(Call.Details, CallScreeningService.CallResponse)}.
* Your app can tell if a call is an incoming call by checking to see if
* {@link Call.Details#getCallDirection()} is {@link Call.Details#DIRECTION_INCOMING}.
* <p>
* For incoming or outgoing calls, the {@link CallScreeningService} can call
* {@link #provideCallIdentification(Call.Details, CallIdentification)} in order to provide
* {@link CallIdentification} for the call.
* <p>
* Note: The {@link Call.Details} instance provided to a call screening service will only have
* the following properties set. The rest of the {@link Call.Details} properties will be set to
* their default value or {@code null}.
* <ul>
* <li>{@link Call.Details#getState()}</li>
* <li>{@link Call.Details#getCallDirection()}</li>
* <li>{@link Call.Details#getConnectTimeMillis()}</li>
* <li>{@link Call.Details#getCreationTimeMillis()}</li>
* <li>{@link Call.Details#getHandle()}</li>
* <li>{@link Call.Details#getHandlePresentation()}</li>
* </ul>
* <p>
* Only calls where the {@link Call.Details#getHandle() handle} {@link Uri#getScheme() scheme}
* is {@link PhoneAccount#SCHEME_TEL} are passed for call
* screening. Further, only calls which are not in the user's contacts are passed for
* screening. For outgoing calls, no post-dial digits are passed.
*
* @param callDetails Information about a new incoming call, see {@link Call.Details}.
* @param callDetails Information about a new call, see {@link Call.Details}.
*/
public abstract void onScreenCall(@NonNull Call.Details callDetails);
/**
* Responds to the given call, either allowing it or disallowing it.
* Responds to the given incoming call, either allowing it or disallowing it.
* <p>
* The {@link CallScreeningService} calls this method to inform the system whether the call
* should be silently blocked or not.
* <p>
* Calls to this method are ignored unless the {@link Call.Details#getCallDirection()} is
* {@link Call.Details#DIRECTION_INCOMING}.
*
* @param callDetails The call to allow.
* <p>

107
telecomm/java/android/telecom/InCallService.java
View File

@@ -40,11 +40,30 @@ import java.util.Collections;
import java.util.List;
/**
* This service is implemented by any app that wishes to provide the user-interface for managing
* phone calls. Telecom binds to this service while there exists a live (active or incoming) call,
* and uses it to notify the in-call app of any live and recently disconnected calls. An app must
* first be set as the default phone app (See {@link TelecomManager#getDefaultDialerPackage()})
* before the telecom service will bind to its {@code InCallService} implementation.
* This service is implemented by an app that wishes to provide functionality for managing
* phone calls.
* <p>
* There are three types of apps which Telecom can bind to when there exists a live (active or
* incoming) call:
* <ol>
* <li>Default Dialer/Phone app - the default dialer/phone app is one which provides the
* in-call user interface while the device is in a call. A device is bundled with a system
* provided default dialer/phone app. The user may choose a single app to take over this role
* from the system app.</li>
* <li>Default Car-mode Dialer/Phone app - the default car-mode dialer/phone app is one which
* provides the in-call user interface while the device is in a call and the device is in car
* mode. The user may choose a single app to fill this role.</li>
* <li>Call Companion app - a call companion app is one which provides no user interface itself,
* but exposes call information to another display surface, such as a wearable device. The
* user may choose multiple apps to fill this role.</li>
* </ol>
* <p>
* Apps which wish to fulfill one of the above roles use the {@link android.app.role.RoleManager}
* to request that they fill the desired role.
*
* <h2>Becoming the Default Phone App</h2>
* An app filling the role of the default phone app provides a user interface while the device is in
* a call, and the device is not in car mode.
* <p>
* Below is an example manifest registration for an {@code InCallService}. The meta-data
* {@link TelecomManager#METADATA_IN_CALL_SERVICE_UI} indicates that this particular
@@ -82,12 +101,34 @@ import java.util.List;
* }
* </pre>
* <p>
* When a user installs your application and runs it for the first time, you should prompt the user
* to see if they would like your application to be the new default phone app. See the
* {@link TelecomManager#ACTION_CHANGE_DEFAULT_DIALER} intent documentation for more information on
* how to do this.
* When a user installs your application and runs it for the first time, you should use the
* {@link android.app.role.RoleManager} to prompt the user to see if they would like your app to
* be the new default phone app.
* <p id="requestRole">
* The code below shows how your app can request to become the default phone/dialer app:
* <pre>
* {@code
* private static final int REQUEST_ID = 1;
*
* public void requestRole() {
* RoleManager roleManager = (RoleManager) getSystemService(ROLE_SERVICE);
* Intent intent = roleManager.createRequestRoleIntent(RoleManager.ROLE_DIALER);
* startActivityForResult(intent, REQUEST_ID);
* }
*
* &#64;Override
* public void onActivityResult(int requestCode, int resultCode, Intent data) {
* if (requestCode == REQUEST_ID) {
* if (resultCode == android.app.Activity.RESULT_OK) {
* // Your app is now the default dialer app
* } else {
* // Your app is not the default dialer app
* }
* }
* }
* </pre>
* <p id="incomingCallNotification">
* <h2>Showing the Incoming Call Notification</h2>
* <h3>Showing the Incoming Call Notification</h3>
* When your app receives a new incoming call via {@link InCallService#onCallAdded(Call)}, it is
* responsible for displaying an incoming call UI for the incoming call. It should do this using
* {@link android.app.NotificationManager} APIs to post a new incoming call notification.
@@ -121,7 +162,7 @@ import java.util.List;
* heads-up notification if the user is actively using the phone. When the user is not using the
* phone, your full-screen incoming call UI is used instead.
* For example:
* <pre><code>
* <pre><code>{@code
* // Create an intent which triggers your fullscreen incoming call user interface.
* Intent intent = new Intent(Intent.ACTION_MAIN, null);
* intent.setFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION | Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -151,7 +192,49 @@ import java.util.List;
* NotificationManager notificationManager = mContext.getSystemService(
* NotificationManager.class);
* notificationManager.notify(YOUR_CHANNEL_ID, YOUR_TAG, YOUR_ID, builder.build());
* </code></pre>
* }</pre>
* <p>
* <h2>Becoming the Default Car-mode Phone App</h2>
* An app filling the role of the default car-mode dialer/phone app provides a user interface while
* the device is in a call, and in car mode. See
* {@link android.app.UiModeManager#ACTION_ENTER_CAR_MODE} for more information about car mode.
* When the device is in car mode, Telecom binds to the default car-mode dialer/phone app instead
* of the usual dialer/phone app.
* <p>
* Similar to the requirements for becoming the default dialer/phone app, your app must declare a
* manifest entry for its {@link InCallService} implementation. Your manifest entry should ensure
* the following conditions are met:
* <ul>
* <li>Do NOT declare the {@link TelecomManager#METADATA_IN_CALL_SERVICE_UI} metadata.</li>
* <li>Set the {@link TelecomManager#METADATA_IN_CALL_SERVICE_CAR_MODE_UI} metadata to
* {@code true}<li>
* <li>Your app must request the permission
* {@link android.Manifest.permission.CALL_COMPANION_APP}.</li>
* </ul>
* <p>
* Your app should request to fill the role {@code android.app.role.CAR_MODE_DIALER_APP} in order to
* become the default (see <a href="#requestRole">above</a> for how to request your app fills this
* role).
*
* <h2>Becoming a Call Companion App</h2>
* An app which fills the companion app role does not directly provide a user interface while the
* device is in a call. Instead, it is typically used to relay information about calls to another
* display surface, such as a wearable device.
* <p>
* Similar to the requirements for becoming the default dialer/phone app, your app must declare a
* manifest entry for its {@link InCallService} implementation. Your manifest entry should
* ensure the following conditions are met:
* <ul>
* <li>Do NOT declare the {@link TelecomManager#METADATA_IN_CALL_SERVICE_UI} metadata.</li>
* <li>Do NOT declare the {@link TelecomManager#METADATA_IN_CALL_SERVICE_CAR_MODE_UI}
* metadata.</li>
* <li>Your app must request the permission
* {@link android.Manifest.permission.CALL_COMPANION_APP}.</li>
* </ul>
* <p>
* Your app should request to fill the role {@code android.app.role.CALL_COMPANION_APP} in order to
* become a call companion app (see <a href="#requestRole">above</a> for how to request your app
* fills this role).
*/
public abstract class InCallService extends Service {

18
telecomm/java/android/telecom/ParcelableCall.java
View File

@@ -24,6 +24,7 @@ import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.RemoteException;
import android.telecom.Call.Details.CallDirection;
import java.util.ArrayList;
import java.util.Collections;
@@ -64,6 +65,7 @@ public final class ParcelableCall implements Parcelable {
private final Bundle mExtras;
private final long mCreationTimeMillis;
private final CallIdentification mCallIdentification;
private final int mCallDirection;
public ParcelableCall(
String id,
@@ -92,7 +94,8 @@ public final class ParcelableCall implements Parcelable {
Bundle intentExtras,
Bundle extras,
long creationTimeMillis,
CallIdentification callIdentification) {
CallIdentification callIdentification,
int callDirection) {
mId = id;
mState = state;
mDisconnectCause = disconnectCause;
@@ -120,6 +123,7 @@ public final class ParcelableCall implements Parcelable {
mExtras = extras;
mCreationTimeMillis = creationTimeMillis;
mCallIdentification = callIdentification;
mCallDirection = callDirection;
}
/** The unique ID of the call. */
@@ -318,6 +322,13 @@ public final class ParcelableCall implements Parcelable {
return mCallIdentification;
}
/**
* Indicates whether the call is an incoming or outgoing call.
*/
public @CallDirection int getCallDirection() {
return mCallDirection;
}
/** Responsible for creating ParcelableCall objects for deserialized Parcels. */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
public static final Parcelable.Creator<ParcelableCall> CREATOR =
@@ -356,6 +367,7 @@ public final class ParcelableCall implements Parcelable {
ParcelableRttCall rttCall = source.readParcelable(classLoader);
long creationTimeMillis = source.readLong();
CallIdentification callIdentification = source.readParcelable(classLoader);
int callDirection = source.readInt();
return new ParcelableCall(
id,
state,
@@ -383,7 +395,8 @@ public final class ParcelableCall implements Parcelable {
intentExtras,
extras,
creationTimeMillis,
callIdentification);
callIdentification,
callDirection);
}
@Override
@@ -429,6 +442,7 @@ public final class ParcelableCall implements Parcelable {
destination.writeParcelable(mRttCall, 0);
destination.writeLong(mCreationTimeMillis);
destination.writeParcelable(mCallIdentification, 0);
destination.writeInt(mCallDirection);
}
@Override