Migrate TelecommConstants to TelecommManager (1019719e) · Commits · e / os / android_frameworks_base

api/current.txt

+7 −11

Original line number	Diff line number	Diff line
		@@ -28717,8 +28717,13 @@ package android.telecomm {
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class TelecommConstants {
		ctor public TelecommConstants();
		public class TelecommManager {
		method public void clearAccounts(java.lang.String);
		method public android.telecomm.PhoneAccount getDefaultOutgoingPhoneAccount();
		method public java.util.List<android.telecomm.PhoneAccount> getEnabledPhoneAccounts();
		method public android.telecomm.PhoneAccountMetadata getPhoneAccountMetadata(android.telecomm.PhoneAccount);
		method public void registerPhoneAccount(android.telecomm.PhoneAccountMetadata);
		method public void unregisterPhoneAccount(android.telecomm.PhoneAccount);
		field public static final java.lang.String ACTION_CONNECTION_SERVICE;
		field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.intent.action.CONNECTION_SERVICE_CONFIGURE";
		field public static final java.lang.String ACTION_INCOMING_CALL = "android.intent.action.INCOMING_CALL";
		@@ -28734,15 +28739,6 @@ package android.telecomm {
		field public static final java.lang.String EXTRA_START_CALL_WITH_VIDEO_STATE = "android.intent.extra.START_CALL_WITH_VIDEO_STATE";
		}

		public class TelecommManager {
		method public void clearAccounts(java.lang.String);
		method public android.telecomm.PhoneAccount getDefaultOutgoingPhoneAccount();
		method public java.util.List<android.telecomm.PhoneAccount> getEnabledPhoneAccounts();
		method public android.telecomm.PhoneAccountMetadata getPhoneAccountMetadata(android.telecomm.PhoneAccount);
		method public void registerPhoneAccount(android.telecomm.PhoneAccountMetadata);
		method public void unregisterPhoneAccount(android.telecomm.PhoneAccount);
		}

		public class VideoCallProfile implements android.os.Parcelable {
		ctor public VideoCallProfile(int, int);
		method public int describeContents();

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.media.AudioManager;
		import android.os.Handler;
		import android.os.UserHandle;
		import android.provider.Settings.Global;
		import android.telecomm.TelecommConstants;
		import android.telecomm.TelecommManager;
		import android.util.Log;

		@@ -90,7 +89,7 @@ public class PhoneStatusBarPolicy {
		else if (action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) {
		updateSimState(intent);
		}
		else if (action.equals(TelecommConstants.ACTION_CURRENT_TTY_MODE_CHANGED)) {
		else if (action.equals(TelecommManager.ACTION_CURRENT_TTY_MODE_CHANGED)) {
		updateTTY(intent);
		}
		else if (action.equals(Intent.ACTION_USER_SWITCHED)) {
		@@ -111,7 +110,7 @@ public class PhoneStatusBarPolicy {
		filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
		filter.addAction(BluetoothAdapter.ACTION_CONNECTION_STATE_CHANGED);
		filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
		filter.addAction(TelecommConstants.ACTION_CURRENT_TTY_MODE_CHANGED);
		filter.addAction(TelecommManager.ACTION_CURRENT_TTY_MODE_CHANGED);
		filter.addAction(Intent.ACTION_USER_SWITCHED);
		mContext.registerReceiver(mIntentReceiver, filter, null, mHandler);

		@@ -270,9 +269,9 @@ public class PhoneStatusBarPolicy {
		}

		private final void updateTTY(Intent intent) {
		int currentTtyMode = intent.getIntExtra(TelecommConstants.EXTRA_CURRENT_TTY_MODE,
		TelecommConstants.TTY_MODE_OFF);
		boolean enabled = currentTtyMode != TelecommConstants.TTY_MODE_OFF;
		int currentTtyMode = intent.getIntExtra(TelecommManager.EXTRA_CURRENT_TTY_MODE,
		TelecommManager.TTY_MODE_OFF);
		boolean enabled = currentTtyMode != TelecommManager.TTY_MODE_OFF;

		if (DEBUG) Log.v(TAG, "updateTTY: enabled: " + enabled);

telecomm/java/android/telecomm/Call.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -431,10 +431,10 @@ public final class Call {
		* While these tones are playing, this {@code Call} will notify listeners via
		* {@link Listener#onPostDial(Call, String)}.
		*
		* If the DTMF string contains a {@link TelecommConstants#DTMF_CHARACTER_PAUSE} symbol, this
		* If the DTMF string contains a {@link TelecommManager#DTMF_CHARACTER_PAUSE} symbol, this
		* {@code Call} will temporarily pause playing the tones for a pre-defined period of time.
		*
		* If the DTMF string contains a {@link TelecommConstants#DTMF_CHARACTER_WAIT} symbol, this
		* If the DTMF string contains a {@link TelecommManager#DTMF_CHARACTER_WAIT} symbol, this
		* {@code Call} will pause playing the tones and notify listeners via
		* {@link Listener#onPostDialWait(Call, String)}. At this point, the in-call app
		* should display to the user an indication of this state and an affordance to continue

telecomm/java/android/telecomm/InCallAdapter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -170,10 +170,10 @@ public final class InCallAdapter {
		* While these tones are playing, Telecomm will notify the {@link InCallService} that the call
		* is in the post dial state.
		*
		* If the DTMF string contains a {@link TelecommConstants#DTMF_CHARACTER_PAUSE} symbol, Telecomm
		* If the DTMF string contains a {@link TelecommManager#DTMF_CHARACTER_PAUSE} symbol, Telecomm
		* will temporarily pause playing the tones for a pre-defined period of time.
		*
		* If the DTMF string contains a {@link TelecommConstants#DTMF_CHARACTER_WAIT} symbol, Telecomm
		* If the DTMF string contains a {@link TelecommManager#DTMF_CHARACTER_WAIT} symbol, Telecomm
		* will pause playing the tones and notify the {@link InCallService} that the call is in the
		* post dial wait state. When the user decides to continue the postdial sequence, the
		* {@link InCallService} should invoke the {@link #postDialContinue(String,boolean)} method.

telecomm/java/android/telecomm/TelecommConstants.java

deleted100644 → 0

+0 −214

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.telecomm;

		import android.content.ComponentName;
		import android.content.Intent;
		import android.os.Bundle;
		import android.telephony.TelephonyManager;

		/**
		* Defines constants for use with the Telecomm system.
		*/
		public final class TelecommConstants {
		/**
		* <p>Activity action: Starts the UI for handing an incoming call. This intent starts the
		* in-call UI by notifying the Telecomm system that an incoming call exists for a specific call
		* service (see {@link android.telecomm.ConnectionService}). Telecomm reads the Intent extras
		* to find and bind to the appropriate {@link android.telecomm.ConnectionService} which
		* Telecomm will ultimately use to control and get information about the call.</p>
		*
		* <p>Input: get*Extra field {@link #EXTRA_PHONE_ACCOUNT} contains the component name of the
		* {@link android.telecomm.ConnectionService} that Telecomm should bind to. Telecomm will then
		* ask the connection service for more information about the call prior to showing any UI.
		*
		* TODO(santoscordon): Needs permissions.
		* TODO(santoscordon): Consider moving this into a simple method call on a system service.
		*/
		public static final String ACTION_INCOMING_CALL = "android.intent.action.INCOMING_CALL";

		/**
		* The service action used to bind to {@link ConnectionService} implementations.
		*/
		public static final String ACTION_CONNECTION_SERVICE = ConnectionService.class.getName();

		/**
		* The {@link Intent} action used to configure a {@link ConnectionService}.
		*/
		public static final String ACTION_CONNECTION_SERVICE_CONFIGURE =
		"android.intent.action.CONNECTION_SERVICE_CONFIGURE";

		/**
		* Optional extra for {@link Intent#ACTION_CALL} containing a boolean that determines whether
		* the speakerphone should be automatically turned on for an outgoing call.
		*/
		public static final String EXTRA_START_CALL_WITH_SPEAKERPHONE =
		"android.intent.extra.START_CALL_WITH_SPEAKERPHONE";

		/**
		* Optional extra for {@link Intent#ACTION_CALL} containing an integer that determines the
		* desired video state for an outgoing call.
		* Valid options: {@link VideoCallProfile#VIDEO_STATE_AUDIO_ONLY},
		* {@link VideoCallProfile#VIDEO_STATE_BIDIRECTIONAL},
		* {@link VideoCallProfile#VIDEO_STATE_RX_ENABLED},
		* {@link VideoCallProfile#VIDEO_STATE_TX_ENABLED}.
		*/
		public static final String EXTRA_START_CALL_WITH_VIDEO_STATE =
		"android.intent.extra.START_CALL_WITH_VIDEO_STATE";

		/**
		* The extra used with an {@link android.content.Intent#ACTION_CALL},
		* {@link #ACTION_INCOMING_CALL}, {@link android.content.Intent#ACTION_DIAL} {@code Intent} to
		* specify a {@link PhoneAccount} to use when making the call.
		*
		* <p class="note">
		* Retrieve with
		* {@link android.content.Intent#getParcelableExtra(String)}.
		*/
		public static final String EXTRA_PHONE_ACCOUNT = "android.intent.extra.PHONE_ACCOUNT";

		/**
		* Optional extra for {@link #ACTION_INCOMING_CALL} containing a {@link Bundle} which contains
		* metadata about the call. This {@link Bundle} will be returned to the
		* {@link ConnectionService}.
		*/
		public static final String EXTRA_INCOMING_CALL_EXTRAS =
		"android.intent.extra.INCOMING_CALL_EXTRAS";

		/**
		* Optional extra for {@link TelephonyManager#ACTION_PHONE_STATE_CHANGED} containing the
		* disconnect code.
		*/
		public static final String EXTRA_CALL_DISCONNECT_CAUSE =
		"android.telecomm.extra.CALL_DISCONNECT_CAUSE";

		/**
		* Optional extra for {@link TelephonyManager#ACTION_PHONE_STATE_CHANGED} containing the
		* disconnect message.
		*/
		public static final String EXTRA_CALL_DISCONNECT_MESSAGE =
		"android.telecomm.extra.CALL_DISCONNECT_MESSAGE";

		/**
		* Optional extra for {@link TelephonyManager#ACTION_PHONE_STATE_CHANGED} containing the
		* component name of the associated connection service.
		*/
		public static final String EXTRA_CONNECTION_SERVICE =
		"android.telecomm.extra.CONNECTION_SERVICE";

		/**
		* The number which the party on the other side of the line will see (and use to return the
		* call).
		* <p>
		* {@link android.telecomm.ConnectionService}s which interact with
		* {@link android.telecomm.RemoteConnection}s should only populate this if the
		* {@link android.telephony.TelephonyManager#getLine1Number()} value, as that is the user's
		* expected caller ID.
		*/
		public static final String EXTRA_CALL_BACK_NUMBER = "android.telecomm.extra.CALL_BACK_NUMBER";

		/**
		* The dual tone multi-frequency signaling character sent to indicate the dialing system should
		* pause for a predefined period.
		*/
		public static final char DTMF_CHARACTER_PAUSE = ',';

		/**
		* The dual-tone multi-frequency signaling character sent to indicate the dialing system should
		* wait for user confirmation before proceeding.
		*/
		public static final char DTMF_CHARACTER_WAIT = ';';

		/**
		* TTY (teletypewriter) mode is off.
		*
		* @hide
		*/
		public static final int TTY_MODE_OFF = 0;

		/**
		* TTY (teletypewriter) mode is on. The speaker is off and the microphone is muted. The user
		* will communicate with the remote party by sending and receiving text messages.
		*
		* @hide
		*/
		public static final int TTY_MODE_FULL = 1;

		/**
		* TTY (teletypewriter) mode is in hearing carryover mode (HCO). The microphone is muted but the
		* speaker is on. The user will communicate with the remote party by sending text messages and
		* hearing an audible reply.
		*
		* @hide
		*/
		public static final int TTY_MODE_HCO = 2;

		/**
		* TTY (teletypewriter) mode is in voice carryover mode (VCO). The speaker is off but the
		* microphone is still on. User will communicate with the remote party by speaking and receiving
		* text message replies.
		*
		* @hide
		*/
		public static final int TTY_MODE_VCO = 3;

		/**
		* Broadcast intent action indicating that the current TTY mode has changed. An intent extra
		* provides this state as an int.
		* @see #EXTRA_CURRENT_TTY_MODE
		*
		* @hide
		*/
		public static final String ACTION_CURRENT_TTY_MODE_CHANGED =
		"android.telecomm.intent.action.CURRENT_TTY_MODE_CHANGED";

		/**
		* The lookup key for an int that indicates the current TTY mode.
		* Valid modes are:
		* - {@link #TTY_MODE_OFF}
		* - {@link #TTY_MODE_FULL}
		* - {@link #TTY_MODE_HCO}
		* - {@link #TTY_MODE_VCO}
		*
		* @hide
		*/
		public static final String EXTRA_CURRENT_TTY_MODE =
		"android.telecomm.intent.extra.CURRENT_TTY_MODE";

		/**
		* Broadcast intent action indicating that the TTY preferred operating mode
		* has changed. An intent extra provides the new mode as an int.
		* @see #EXTRA_TTY_PREFERRED_MODE
		*
		* @hide
		*/
		public static final String ACTION_TTY_PREFERRED_MODE_CHANGED =
		"android.telecomm.intent.action.TTY_PREFERRED_MODE_CHANGED";

		/**
		* The lookup key for an int that indicates preferred TTY mode.
		* Valid modes are:
		* - {@link #TTY_MODE_OFF}
		* - {@link #TTY_MODE_FULL}
		* - {@link #TTY_MODE_HCO}
		* - {@link #TTY_MODE_VCO}
		*
		* @hide
		*/
		public static final String EXTRA_TTY_PREFERRED_MODE =
		"android.telecomm.intent.extra.TTY_PREFERRED";
		}