Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7387201 authored Nov 01, 2023 by Brad Ebinger Committed by Automerger Merge Worker Nov 01, 2023

Merge "Modify docs to clarify rules around placing calls to CF MMI codes" into...

Merge "Modify docs to clarify rules around placing calls to CF MMI codes" into main am: a0b29244 am: e9e474e8 am: 78e475aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2811013

Change-Id: If11a08f80692e28fa0e0dbc27c2ae807cf4979f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 84be5de9 78e475aa

core/java/android/content/Intent.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1164,6 +1164,11 @@ public class Intent implements Parcelable, Cloneable {
	* numbers. Applications can <strong>dial</strong> emergency numbers using		* numbers. Applications can <strong>dial</strong> emergency numbers using
	* {@link #ACTION_DIAL}, however.		* {@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		* <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		* {@link android.telecom.TelecomManager#placeCall(Uri, Bundle)} to place calls rather than
	* relying on this intent.		* relying on this intent.

telecomm/java/android/telecom/TelecomManager.java

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2371,6 +2371,11 @@ public class TelecomManager {
	* <p>		* <p>
	* <b>Note</b>: {@link android.app.Notification.CallStyle} notifications should be posted after		* <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.		* 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 address The address to make the call to.
	* @param extras Bundle of extras to use with the call.		* @param extras Bundle of extras to use with the call.
	*/		*/