diff options
| author | 2023-11-01 20:17:57 +0000 | |
|---|---|---|
| committer | 2023-11-01 20:17:57 +0000 | |
| commit | 78e475aac9794a24dff9eb9306a5e42f11f455f0 (patch) | |
| tree | 5f25d563a414c626a4a1b31436b7117e65a5b3a4 | |
| parent | ba974e577ac56a6f994c1db68cdf35984c4531bf (diff) | |
| parent | e9e474e82d1e6d5f059f4861bf747a6d72b621de (diff) | |
Merge "Modify docs to clarify rules around placing calls to CF MMI codes" into main am: a0b29244af am: e9e474e82d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2811013
Change-Id: I3b7bce763ae2370b75ffbf61da2d77044db9cc1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/content/Intent.java | 5 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 445eed34fc3b..5e7ceb31f57e 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1161,6 +1161,11 @@ public class Intent implements Parcelable, Cloneable { * numbers. Applications can <strong>dial</strong> emergency numbers using * {@link #ACTION_DIAL}, however. * + * <p>Note: This Intent can only be used to dial call forwarding MMI codes if the application + * using this intent is set as the default or system dialer. The system will treat any other + * application using this Intent for the purpose of dialing call forwarding MMI codes as if the + * {@link #ACTION_DIAL} Intent was used instead. + * * <p>Note: An app filling the {@link android.app.role.RoleManager#ROLE_DIALER} role should use * {@link android.telecom.TelecomManager#placeCall(Uri, Bundle)} to place calls rather than * relying on this intent. diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java index a72f7806d3ea..89ef523c2c71 100644 --- a/telecomm/java/android/telecom/TelecomManager.java +++ b/telecomm/java/android/telecom/TelecomManager.java @@ -2352,6 +2352,11 @@ public class TelecomManager { * <p> * <b>Note</b>: {@link android.app.Notification.CallStyle} notifications should be posted after * the call is placed in order for the notification to be non-dismissible. + * <p><b>Note</b>: Call Forwarding MMI codes can only be dialed by applications that are + * configured as the user defined default dialer or system dialer role. If a call containing a + * call forwarding MMI code is placed by an application that is not in one of these roles, the + * dialer will be launched with a UI showing the MMI code already populated so that the user can + * confirm the action before the call is placed. * @param address The address to make the call to. * @param extras Bundle of extras to use with the call. */ |