Merge "Add call recording tone support." (eb74233f) · Commits · e / os / android_frameworks_base

data/etc/privapp-permissions-platform.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -212,6 +212,7 @@ applications that come with the platform
		<permission name="android.permission.CALL_PRIVILEGED"/>
		<permission name="android.permission.INTERACT_ACROSS_USERS"/>
		<permission name="android.permission.MANAGE_USERS"/>
		<permission name="android.permission.MODIFY_AUDIO_ROUTING" />
		<permission name="android.permission.MODIFY_PHONE_STATE"/>
		<permission name="android.permission.STOP_APP_SWITCHES"/>
		<permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>

+19 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,25 @@ public final class PhoneAccount implements Parcelable {
		public static final String EXTRA_LOG_SELF_MANAGED_CALLS =
		"android.telecom.extra.LOG_SELF_MANAGED_CALLS";

		/**
		* Boolean {@link PhoneAccount} extras key (see {@link PhoneAccount#getExtras()}) which
		* indicates whether calls for a {@link PhoneAccount} should generate a "call recording tone"
		* when the user is recording audio on the device.
		* <p>
		* The call recording tone is played over the telephony audio stream so that the remote party
		* has an audible indication that it is possible their call is being recorded using a call
		* recording app on the device.
		* <p>
		* This extra only has an effect for calls placed via Telephony (e.g.
		* {@link #CAPABILITY_SIM_SUBSCRIPTION}).
		* <p>
		* The call recording tone is a 1400 hz tone which repeats every 15 seconds while recording is
		* in progress.
		* @hide
		*/
		public static final String EXTRA_PLAY_CALL_RECORDING_TONE =
		"android.telecom.extra.PLAY_CALL_RECORDING_TONE";

		/**
		* Flag indicating that this {@code PhoneAccount} can act as a connection manager for
		* other connections. The {@link ConnectionService} associated with this {@code PhoneAccount}

+10 −0

Original line number	Diff line number	Diff line
		@@ -153,6 +153,15 @@ public class CarrierConfigManager {
		*/
		public static final String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";

		/**
		* Determines if the carrier requires that a tone be played to the remote party when an app is
		* recording audio during a call (e.g. using a call recording app).
		* <p>
		* Note: This requires the Telephony config_supports_telephony_audio_device overlay to be true
		* in order to work.
		* @hide
		*/
		public static final String KEY_PLAY_CALL_RECORDING_TONE_BOOL = "play_call_recording_tone_bool";
		/**
		* Determines if the carrier requires converting the destination number before sending out an
		* SMS. Certain networks and numbering plans require different formats.
		@@ -1787,6 +1796,7 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);
		sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);
		sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);
		sDefaults.putBoolean(KEY_PLAY_CALL_RECORDING_TONE_BOOL, false);
		sDefaults.putBoolean(KEY_APN_EXPAND_BOOL, true);
		sDefaults.putBoolean(KEY_AUTO_RETRY_ENABLED_BOOL, false);
		sDefaults.putBoolean(KEY_CARRIER_SETTINGS_ENABLE_BOOL, false);