Renaming Telecomm to Telecom.
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.
Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
diff --git a/telecomm/java/android/telecomm/AudioState.aidl b/telecomm/java/android/telecom/AudioState.aidl
similarity index 95%
rename from telecomm/java/android/telecomm/AudioState.aidl
rename to telecomm/java/android/telecom/AudioState.aidl
index 03772b6..b36e238 100644
--- a/telecomm/java/android/telecomm/AudioState.aidl
+++ b/telecomm/java/android/telecom/AudioState.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/AudioState.java b/telecomm/java/android/telecom/AudioState.java
similarity index 99%
rename from telecomm/java/android/telecomm/AudioState.java
rename to telecomm/java/android/telecom/AudioState.java
index 314704b..d0e2860 100644
--- a/telecomm/java/android/telecomm/AudioState.java
+++ b/telecomm/java/android/telecom/AudioState.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/telecomm/java/android/telecomm/Call.java b/telecomm/java/android/telecom/Call.java
similarity index 94%
rename from telecomm/java/android/telecomm/Call.java
rename to telecomm/java/android/telecom/Call.java
index 7ada9b1..1d33b3b 100644
--- a/telecomm/java/android/telecomm/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.annotation.SystemApi;
-import android.app.PendingIntent;
import android.net.Uri;
import android.os.Bundle;
import android.telephony.DisconnectCause;
@@ -108,7 +107,7 @@
/**
* @return The presentation requirements for the handle. See
- * {@link TelecommManager} for valid values.
+ * {@link TelecomManager} for valid values.
*/
public int getHandlePresentation() {
return mHandlePresentation;
@@ -123,7 +122,7 @@
/**
* @return The presentation requirements for the caller display name. See
- * {@link TelecommManager} for valid values.
+ * {@link TelecomManager} for valid values.
*/
public int getCallerDisplayNamePresentation() {
return mCallerDisplayNamePresentation;
@@ -193,7 +192,7 @@
}
/**
- * @return The current {@link android.telecomm.StatusHints}, or {@code null} if none
+ * @return The current {@link android.telecom.StatusHints}, or {@code null} if none
* have been set.
*/
public StatusHints getStatusHints() {
@@ -369,7 +368,7 @@
}
private final Phone mPhone;
- private final String mTelecommCallId;
+ private final String mTelecomCallId;
private final InCallAdapter mInCallAdapter;
private final List<String> mChildrenIds = new ArrayList<>();
private final List<Call> mChildren = new ArrayList<>();
@@ -402,7 +401,7 @@
* @param videoState The video state in which to answer the call.
*/
public void answer(int videoState) {
- mInCallAdapter.answerCall(mTelecommCallId, videoState);
+ mInCallAdapter.answerCall(mTelecomCallId, videoState);
}
/**
@@ -412,28 +411,28 @@
* @param textMessage An optional text message with which to respond.
*/
public void reject(boolean rejectWithMessage, String textMessage) {
- mInCallAdapter.rejectCall(mTelecommCallId, rejectWithMessage, textMessage);
+ mInCallAdapter.rejectCall(mTelecomCallId, rejectWithMessage, textMessage);
}
/**
* Instructs this {@code Call} to disconnect.
*/
public void disconnect() {
- mInCallAdapter.disconnectCall(mTelecommCallId);
+ mInCallAdapter.disconnectCall(mTelecomCallId);
}
/**
* Instructs this {@code Call} to go on hold.
*/
public void hold() {
- mInCallAdapter.holdCall(mTelecommCallId);
+ mInCallAdapter.holdCall(mTelecomCallId);
}
/**
* Instructs this {@link #STATE_HOLDING} call to release from hold.
*/
public void unhold() {
- mInCallAdapter.unholdCall(mTelecommCallId);
+ mInCallAdapter.unholdCall(mTelecomCallId);
}
/**
@@ -445,7 +444,7 @@
* value must be one of {@code '0'} through {@code '9'}, {@code '*'} or {@code '#'}.
*/
public void playDtmfTone(char digit) {
- mInCallAdapter.playDtmfTone(mTelecommCallId, digit);
+ mInCallAdapter.playDtmfTone(mTelecomCallId, digit);
}
/**
@@ -456,7 +455,7 @@
* currently playing, this method will do nothing.
*/
public void stopDtmfTone() {
- mInCallAdapter.stopDtmfTone(mTelecommCallId);
+ mInCallAdapter.stopDtmfTone(mTelecomCallId);
}
/**
@@ -465,10 +464,10 @@
* A post-dial DTMF string is a string of digits entered after a phone number, when dialed,
* that are immediately sent as DTMF tones to the recipient as soon as the connection is made.
*
- * If the DTMF string contains a {@link TelecommManager#DTMF_CHARACTER_PAUSE} symbol, this
+ * If the DTMF string contains a {@link TelecomManager#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 TelecommManager#DTMF_CHARACTER_WAIT} symbol, this
+ * If the DTMF string contains a {@link TelecomManager#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
@@ -478,7 +477,7 @@
* @param proceed Whether or not to continue with the post-dial sequence.
*/
public void postDialContinue(boolean proceed) {
- mInCallAdapter.postDialContinue(mTelecommCallId, proceed);
+ mInCallAdapter.postDialContinue(mTelecomCallId, proceed);
}
/**
@@ -486,7 +485,7 @@
* an outgoing call.
*/
public void phoneAccountSelected(PhoneAccountHandle accountHandle) {
- mInCallAdapter.phoneAccountSelected(mTelecommCallId, accountHandle);
+ mInCallAdapter.phoneAccountSelected(mTelecomCallId, accountHandle);
}
@@ -497,7 +496,7 @@
*/
public void conference(Call callToConferenceWith) {
if (callToConferenceWith != null) {
- mInCallAdapter.conference(mTelecommCallId, callToConferenceWith.mTelecommCallId);
+ mInCallAdapter.conference(mTelecomCallId, callToConferenceWith.mTelecomCallId);
}
}
@@ -506,21 +505,21 @@
* connected.
*/
public void splitFromConference() {
- mInCallAdapter.splitFromConference(mTelecommCallId);
+ mInCallAdapter.splitFromConference(mTelecomCallId);
}
/**
* Merges the calls within this conference. See {@link PhoneCapabilities#MERGE_CONFERENCE}.
*/
public void mergeConference() {
- mInCallAdapter.mergeConference(mTelecommCallId);
+ mInCallAdapter.mergeConference(mTelecomCallId);
}
/**
* Swaps the calls within this conference. See {@link PhoneCapabilities#SWAP_CONFERENCE}.
*/
public void swapConference() {
- mInCallAdapter.swapConference(mTelecommCallId);
+ mInCallAdapter.swapConference(mTelecomCallId);
}
/**
@@ -531,7 +530,7 @@
*/
public Call getParent() {
if (mParentId != null) {
- return mPhone.internalGetCallByTelecommId(mParentId);
+ return mPhone.internalGetCallByTelecomId(mParentId);
}
return null;
}
@@ -548,7 +547,7 @@
mChildren.clear();
for(String id : mChildrenIds) {
- Call call = mPhone.internalGetCallByTelecommId(id);
+ Call call = mPhone.internalGetCallByTelecomId(id);
if (call == null) {
// At least one child was still not found, so do not save true for "cached"
mChildrenCached = false;
@@ -632,16 +631,16 @@
}
/** {@hide} */
- Call(Phone phone, String telecommCallId, InCallAdapter inCallAdapter) {
+ Call(Phone phone, String telecomCallId, InCallAdapter inCallAdapter) {
mPhone = phone;
- mTelecommCallId = telecommCallId;
+ mTelecomCallId = telecomCallId;
mInCallAdapter = inCallAdapter;
mState = STATE_NEW;
}
/** {@hide} */
final String internalGetCallId() {
- return mTelecommCallId;
+ return mTelecomCallId;
}
/** {@hide} */
diff --git a/telecomm/java/android/telecomm/CallProperties.java b/telecomm/java/android/telecom/CallProperties.java
similarity index 96%
rename from telecomm/java/android/telecomm/CallProperties.java
rename to telecomm/java/android/telecom/CallProperties.java
index 90eb0cb..b1b82e2 100644
--- a/telecomm/java/android/telecomm/CallProperties.java
+++ b/telecomm/java/android/telecom/CallProperties.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package android.telecomm;
+package android.telecom;
/**
* Defines properties of a phone call which may be affected by changes to the call.
diff --git a/telecomm/java/android/telecomm/CallState.java b/telecomm/java/android/telecom/CallState.java
similarity index 97%
rename from telecomm/java/android/telecomm/CallState.java
rename to telecomm/java/android/telecom/CallState.java
index 0770e26..7690847 100644
--- a/telecomm/java/android/telecomm/CallState.java
+++ b/telecomm/java/android/telecom/CallState.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.annotation.SystemApi;
@@ -33,7 +33,7 @@
/**
* Indicates that a call is new and not connected. This is used as the default state internally
- * within Telecomm and should not be used between Telecomm and call services. Call services are
+ * within Telecom and should not be used between Telecom and call services. Call services are
* not expected to ever interact with NEW calls, but {@link InCallService}s will see calls in
* this state.
*/
diff --git a/telecomm/java/android/telecomm/CameraCapabilities.aidl b/telecomm/java/android/telecom/CameraCapabilities.aidl
similarity index 96%
rename from telecomm/java/android/telecomm/CameraCapabilities.aidl
rename to telecomm/java/android/telecom/CameraCapabilities.aidl
index 08e6f43..c8e0c5e 100644
--- a/telecomm/java/android/telecomm/CameraCapabilities.aidl
+++ b/telecomm/java/android/telecom/CameraCapabilities.aidl
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/CameraCapabilities.java b/telecomm/java/android/telecom/CameraCapabilities.java
similarity index 99%
rename from telecomm/java/android/telecomm/CameraCapabilities.java
rename to telecomm/java/android/telecom/CameraCapabilities.java
index 5f860db..f968c13 100644
--- a/telecomm/java/android/telecomm/CameraCapabilities.java
+++ b/telecomm/java/android/telecom/CameraCapabilities.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package android.telecomm;
+package android.telecom;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/telecomm/java/android/telecomm/Conference.java b/telecomm/java/android/telecom/Conference.java
similarity index 99%
rename from telecomm/java/android/telecomm/Conference.java
rename to telecomm/java/android/telecom/Conference.java
index a4f9c2c..ca85446 100644
--- a/telecomm/java/android/telecomm/Conference.java
+++ b/telecomm/java/android/telecom/Conference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.telephony.DisconnectCause;
diff --git a/telecomm/java/android/telecomm/Connection.java b/telecomm/java/android/telecom/Connection.java
similarity index 98%
rename from telecomm/java/android/telecomm/Connection.java
rename to telecomm/java/android/telecom/Connection.java
index 2f25dcf..5f63af3 100644
--- a/telecomm/java/android/telecomm/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -14,12 +14,11 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
-import com.android.internal.telecomm.IVideoCallback;
-import com.android.internal.telecomm.IVideoProvider;
+import com.android.internal.telecom.IVideoCallback;
+import com.android.internal.telecom.IVideoProvider;
-import android.app.PendingIntent;
import android.net.Uri;
import android.os.Handler;
import android.os.IBinder;
@@ -493,7 +492,7 @@
/**
* @return The presentation requirements for the address.
- * See {@link TelecommManager} for valid values.
+ * See {@link TelecomManager} for valid values.
*/
public final int getAddressPresentation() {
return mAddressPresentation;
@@ -508,7 +507,7 @@
/**
* @return The presentation requirements for the handle.
- * See {@link TelecommManager} for valid values.
+ * See {@link TelecomManager} for valid values.
*/
public final int getCallerDisplayNamePresentation() {
return mCallerDisplayNamePresentation;
@@ -666,7 +665,7 @@
*
* @param address The new address.
* @param presentation The presentation requirements for the address.
- * See {@link TelecommManager} for valid values.
+ * See {@link TelecomManager} for valid values.
*/
public final void setAddress(Uri address, int presentation) {
Log.d(this, "setAddress %s", address);
@@ -682,7 +681,7 @@
*
* @param callerDisplayName The new display name.
* @param presentation The presentation requirements for the handle.
- * See {@link TelecommManager} for valid values.
+ * See {@link TelecomManager} for valid values.
*/
public final void setCallerDisplayName(String callerDisplayName, int presentation) {
Log.d(this, "setCallerDisplayName %s", callerDisplayName);
diff --git a/telecomm/java/android/telecomm/ConnectionRequest.aidl b/telecomm/java/android/telecom/ConnectionRequest.aidl
similarity index 96%
rename from telecomm/java/android/telecomm/ConnectionRequest.aidl
rename to telecomm/java/android/telecom/ConnectionRequest.aidl
index 6081c22..de39c67 100644
--- a/telecomm/java/android/telecomm/ConnectionRequest.aidl
+++ b/telecomm/java/android/telecom/ConnectionRequest.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/ConnectionRequest.java b/telecomm/java/android/telecom/ConnectionRequest.java
similarity index 99%
rename from telecomm/java/android/telecomm/ConnectionRequest.java
rename to telecomm/java/android/telecom/ConnectionRequest.java
index d5a6aa5..71b481b 100644
--- a/telecomm/java/android/telecomm/ConnectionRequest.java
+++ b/telecomm/java/android/telecom/ConnectionRequest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.net.Uri;
import android.os.Bundle;
diff --git a/telecomm/java/android/telecomm/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
similarity index 98%
rename from telecomm/java/android/telecomm/ConnectionService.java
rename to telecomm/java/android/telecom/ConnectionService.java
index 05ddc27..cc80e22 100644
--- a/telecomm/java/android/telecomm/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.annotation.SdkConstant;
-import android.app.PendingIntent;
import android.app.Service;
import android.content.ComponentName;
import android.content.Intent;
@@ -29,9 +28,9 @@
import android.telephony.DisconnectCause;
import com.android.internal.os.SomeArgs;
-import com.android.internal.telecomm.IConnectionService;
-import com.android.internal.telecomm.IConnectionServiceAdapter;
-import com.android.internal.telecomm.RemoteServiceCallback;
+import com.android.internal.telecom.IConnectionService;
+import com.android.internal.telecom.IConnectionServiceAdapter;
+import com.android.internal.telecom.RemoteServiceCallback;
import java.util.ArrayList;
import java.util.Collection;
@@ -50,7 +49,7 @@
* The {@link Intent} that must be declared as handled by the service.
*/
@SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
- public static final String SERVICE_INTERFACE = "android.telecomm.ConnectionService";
+ public static final String SERVICE_INTERFACE = "android.telecom.ConnectionService";
// Flag controlling whether PII is emitted into the logs
private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);
@@ -391,7 +390,7 @@
mAdapter.setOnHold(id);
break;
case Connection.STATE_NEW:
- // Nothing to tell Telecomm
+ // Nothing to tell Telecom
break;
case Connection.STATE_RINGING:
mAdapter.setRinging(id);
@@ -506,8 +505,8 @@
}
/**
- * This can be used by telecomm to either create a new outgoing call or attach to an existing
- * incoming call. In either case, telecomm will cycle through a set of services and call
+ * This can be used by telecom to either create a new outgoing call or attach to an existing
+ * incoming call. In either case, telecom will cycle through a set of services and call
* createConnection util a connection service cancels the process or completes it successfully.
*/
private void createConnection(
diff --git a/telecomm/java/android/telecomm/ConnectionServiceAdapter.java b/telecomm/java/android/telecom/ConnectionServiceAdapter.java
similarity index 96%
rename from telecomm/java/android/telecomm/ConnectionServiceAdapter.java
rename to telecomm/java/android/telecom/ConnectionServiceAdapter.java
index 19f42d6..f6bcdc6 100644
--- a/telecomm/java/android/telecomm/ConnectionServiceAdapter.java
+++ b/telecomm/java/android/telecom/ConnectionServiceAdapter.java
@@ -14,15 +14,14 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
-import android.app.PendingIntent;
import android.net.Uri;
import android.os.IBinder.DeathRecipient;
import android.os.RemoteException;
-import com.android.internal.telecomm.IConnectionServiceAdapter;
-import com.android.internal.telecomm.RemoteServiceCallback;
+import com.android.internal.telecom.IConnectionServiceAdapter;
+import com.android.internal.telecom.RemoteServiceCallback;
import java.util.Collections;
import java.util.Iterator;
@@ -163,10 +162,10 @@
}
/**
- * Asks Telecomm to start or stop a ringback tone for a call.
+ * Asks Telecom to start or stop a ringback tone for a call.
*
* @param callId The unique ID of the call whose ringback is being changed.
- * @param ringback Whether Telecomm should start playing a ringback tone.
+ * @param ringback Whether Telecom should start playing a ringback tone.
*/
void setRingbackRequested(String callId, boolean ringback) {
for (IConnectionServiceAdapter adapter : mAdapters) {
diff --git a/telecomm/java/android/telecomm/ConnectionServiceAdapterServant.java b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
similarity index 98%
rename from telecomm/java/android/telecomm/ConnectionServiceAdapterServant.java
rename to telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
index 2aac7fc..ffbbc8a 100644
--- a/telecomm/java/android/telecomm/ConnectionServiceAdapterServant.java
+++ b/telecomm/java/android/telecom/ConnectionServiceAdapterServant.java
@@ -14,18 +14,17 @@
R* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
-import android.app.PendingIntent;
import android.net.Uri;
import android.os.Handler;
import android.os.Message;
import android.os.RemoteException;
import com.android.internal.os.SomeArgs;
-import com.android.internal.telecomm.IConnectionServiceAdapter;
-import com.android.internal.telecomm.IVideoProvider;
-import com.android.internal.telecomm.RemoteServiceCallback;
+import com.android.internal.telecom.IConnectionServiceAdapter;
+import com.android.internal.telecom.IVideoProvider;
+import com.android.internal.telecom.RemoteServiceCallback;
import java.util.List;
diff --git a/telecomm/java/android/telecomm/GatewayInfo.aidl b/telecomm/java/android/telecom/GatewayInfo.aidl
similarity index 95%
rename from telecomm/java/android/telecomm/GatewayInfo.aidl
rename to telecomm/java/android/telecom/GatewayInfo.aidl
index bd81014..ad9858c 100644
--- a/telecomm/java/android/telecomm/GatewayInfo.aidl
+++ b/telecomm/java/android/telecom/GatewayInfo.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/GatewayInfo.java b/telecomm/java/android/telecom/GatewayInfo.java
similarity index 98%
rename from telecomm/java/android/telecomm/GatewayInfo.java
rename to telecomm/java/android/telecom/GatewayInfo.java
index a720284..583c3e2 100644
--- a/telecomm/java/android/telecomm/GatewayInfo.java
+++ b/telecomm/java/android/telecom/GatewayInfo.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.annotation.SystemApi;
import android.net.Uri;
diff --git a/telecomm/java/android/telecomm/InCallAdapter.java b/telecomm/java/android/telecom/InCallAdapter.java
similarity index 82%
rename from telecomm/java/android/telecomm/InCallAdapter.java
rename to telecomm/java/android/telecom/InCallAdapter.java
index 899f35e..fd3cf2e 100644
--- a/telecomm/java/android/telecomm/InCallAdapter.java
+++ b/telecomm/java/android/telecom/InCallAdapter.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.os.RemoteException;
-import com.android.internal.telecomm.IInCallAdapter;
+import com.android.internal.telecom.IInCallAdapter;
/**
* Receives commands from {@link InCallService} implementations which should be executed by
- * Telecomm. When Telecomm binds to a {@link InCallService}, an instance of this class is given to
+ * Telecom. When Telecom binds to a {@link InCallService}, an instance of this class is given to
* the in-call service through which it can manipulate live (active, dialing, ringing) calls. When
* the in-call service is notified of new calls, it can use the
* given call IDs to execute commands such as {@link #answerCall} for incoming calls or
@@ -44,7 +44,7 @@
}
/**
- * Instructs Telecomm to answer the specified call.
+ * Instructs Telecom to answer the specified call.
*
* @param callId The identifier of the call to answer.
* @param videoState The video state in which to answer the call.
@@ -57,7 +57,7 @@
}
/**
- * Instructs Telecomm to reject the specified call.
+ * Instructs Telecom to reject the specified call.
*
* @param callId The identifier of the call to reject.
* @param rejectWithMessage Whether to reject with a text message.
@@ -71,7 +71,7 @@
}
/**
- * Instructs Telecomm to disconnect the specified call.
+ * Instructs Telecom to disconnect the specified call.
*
* @param callId The identifier of the call to disconnect.
*/
@@ -83,7 +83,7 @@
}
/**
- * Instructs Telecomm to put the specified call on hold.
+ * Instructs Telecom to put the specified call on hold.
*
* @param callId The identifier of the call to put on hold.
*/
@@ -95,7 +95,7 @@
}
/**
- * Instructs Telecomm to release the specified call from hold.
+ * Instructs Telecom to release the specified call from hold.
*
* @param callId The identifier of the call to release from hold.
*/
@@ -131,7 +131,7 @@
}
/**
- * Instructs Telecomm to play a dual-tone multi-frequency signaling (DTMF) tone in a call.
+ * Instructs Telecom to play a dual-tone multi-frequency signaling (DTMF) tone in a call.
*
* Any other currently playing DTMF tone in the specified call is immediately stopped.
*
@@ -147,7 +147,7 @@
}
/**
- * Instructs Telecomm to stop any dual-tone multi-frequency signaling (DTMF) tone currently
+ * Instructs Telecom to stop any dual-tone multi-frequency signaling (DTMF) tone currently
* playing.
*
* DTMF tones are played by calling {@link #playDtmfTone(String,char)}. If no DTMF tone is
@@ -163,17 +163,17 @@
}
/**
- * Instructs Telecomm to continue playing a post-dial DTMF string.
+ * Instructs Telecom to continue playing a post-dial DTMF string.
*
* A post-dial DTMF string is a string of digits entered after a phone number, when dialed,
* that are immediately sent as DTMF tones to the recipient as soon as the connection is made.
- * While these tones are playing, Telecomm will notify the {@link InCallService} that the call
+ * While these tones are playing, Telecom will notify the {@link InCallService} that the call
* is in the post dial state.
*
- * If the DTMF string contains a {@link TelecommManager#DTMF_CHARACTER_PAUSE} symbol, Telecomm
+ * If the DTMF string contains a {@link TelecomManager#DTMF_CHARACTER_PAUSE} symbol, Telecom
* will temporarily pause playing the tones for a pre-defined period of time.
*
- * If the DTMF string contains a {@link TelecommManager#DTMF_CHARACTER_WAIT} symbol, Telecomm
+ * If the DTMF string contains a {@link TelecomManager#DTMF_CHARACTER_WAIT} symbol, Telecom
* 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.
@@ -189,7 +189,7 @@
}
/**
- * Instructs Telecomm to add a PhoneAccountHandle to the specified call
+ * Instructs Telecom to add a PhoneAccountHandle to the specified call
*
* @param callId The identifier of the call
* @param accountHandle The PhoneAccountHandle through which to place the call
@@ -202,7 +202,7 @@
}
/**
- * Instructs Telecomm to conference the specified call.
+ * Instructs Telecom to conference the specified call.
*
* @param callId The unique ID of the call.
* @hide
@@ -215,7 +215,7 @@
}
/**
- * Instructs Telecomm to split the specified call from any conference call with which it may be
+ * Instructs Telecom to split the specified call from any conference call with which it may be
* connected.
*
* @param callId The unique ID of the call.
@@ -229,7 +229,7 @@
}
/**
- * Instructs Telecomm to merge child calls of the specified conference call.
+ * Instructs Telecom to merge child calls of the specified conference call.
*/
public void mergeConference(String callId) {
try {
@@ -239,7 +239,7 @@
}
/**
- * Instructs Telecomm to swap the child calls of the specified conference call.
+ * Instructs Telecom to swap the child calls of the specified conference call.
*/
public void swapConference(String callId) {
try {
@@ -249,7 +249,7 @@
}
/**
- * Instructs Telecomm to turn the proximity sensor on.
+ * Instructs Telecom to turn the proximity sensor on.
*/
public void turnProximitySensorOn() {
try {
@@ -259,7 +259,7 @@
}
/**
- * Instructs Telecomm to turn the proximity sensor off.
+ * Instructs Telecom to turn the proximity sensor off.
*
* @param screenOnImmediately If true, the screen will be turned on immediately if it was
* previously off. Otherwise, the screen will only be turned on after the proximity sensor
diff --git a/telecomm/java/android/telecomm/InCallService.java b/telecomm/java/android/telecom/InCallService.java
similarity index 97%
rename from telecomm/java/android/telecomm/InCallService.java
rename to telecomm/java/android/telecom/InCallService.java
index 51cd537..fa12756 100644
--- a/telecomm/java/android/telecomm/InCallService.java
+++ b/telecomm/java/android/telecom/InCallService.java
@@ -14,11 +14,10 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.annotation.SystemApi;
import android.annotation.SdkConstant;
-import android.app.PendingIntent;
import android.app.Service;
import android.content.Intent;
import android.os.Handler;
@@ -28,14 +27,14 @@
import android.view.Surface;
import com.android.internal.os.SomeArgs;
-import com.android.internal.telecomm.IInCallAdapter;
-import com.android.internal.telecomm.IInCallService;
+import com.android.internal.telecom.IInCallAdapter;
+import com.android.internal.telecom.IInCallService;
import java.lang.String;
/**
* This service is implemented by any app that wishes to provide the user-interface for managing
- * phone calls. Telecomm binds to this service while there exists a live (active or incoming) call,
+ * 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 and recently disconnected calls.
*
* {@hide}
@@ -47,7 +46,7 @@
* The {@link Intent} that must be declared as handled by the service.
*/
@SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
- public static final String SERVICE_INTERFACE = "android.telecomm.InCallService";
+ public static final String SERVICE_INTERFACE = "android.telecom.InCallService";
private static final int MSG_SET_IN_CALL_ADAPTER = 1;
private static final int MSG_ADD_CALL = 2;
diff --git a/telecomm/java/android/telecomm/Log.java b/telecomm/java/android/telecom/Log.java
similarity index 97%
rename from telecomm/java/android/telecomm/Log.java
rename to telecomm/java/android/telecom/Log.java
index 446ae75..73cc4a5 100644
--- a/telecomm/java/android/telecomm/Log.java
+++ b/telecomm/java/android/telecom/Log.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
@@ -28,8 +28,8 @@
*/
final public class Log {
- // Generic tag for all Telecomm Framework logging
- private static final String TAG = "TelecommFramework";
+ // Generic tag for all Telecom Framework logging
+ private static final String TAG = "TelecomFramework";
public static final boolean FORCE_LOGGING = false; /* STOP SHIP if true */
public static final boolean DEBUG = isLoggable(android.util.Log.DEBUG);
diff --git a/telecomm/java/android/telecomm/ParcelableCall.aidl b/telecomm/java/android/telecom/ParcelableCall.aidl
similarity index 96%
rename from telecomm/java/android/telecomm/ParcelableCall.aidl
rename to telecomm/java/android/telecom/ParcelableCall.aidl
index 18691d2..480e82f 100644
--- a/telecomm/java/android/telecomm/ParcelableCall.aidl
+++ b/telecomm/java/android/telecom/ParcelableCall.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/ParcelableCall.java b/telecomm/java/android/telecom/ParcelableCall.java
similarity index 98%
rename from telecomm/java/android/telecomm/ParcelableCall.java
rename to telecomm/java/android/telecom/ParcelableCall.java
index f7fc125..838c7cf 100644
--- a/telecomm/java/android/telecomm/ParcelableCall.java
+++ b/telecomm/java/android/telecom/ParcelableCall.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.net.Uri;
import android.os.Bundle;
@@ -27,10 +27,10 @@
import java.util.Collections;
import java.util.List;
-import com.android.internal.telecomm.IVideoProvider;
+import com.android.internal.telecom.IVideoProvider;
/**
- * Information about a call that is used between InCallService and Telecomm.
+ * Information about a call that is used between InCallService and Telecom.
* @hide
*/
public final class ParcelableCall implements Parcelable {
@@ -154,7 +154,7 @@
}
/**
- * The presentation requirements for the handle. See {@link TelecommManager} for valid values.
+ * The presentation requirements for the handle. See {@link TelecomManager} for valid values.
*/
public int getHandlePresentation() {
return mHandlePresentation;
@@ -167,7 +167,7 @@
/**
* The presentation requirements for the caller display name.
- * See {@link TelecommManager} for valid values.
+ * See {@link TelecomManager} for valid values.
*/
public int getCallerDisplayNamePresentation() {
return mCallerDisplayNamePresentation;
diff --git a/telecomm/java/android/telecomm/ParcelableConference.aidl b/telecomm/java/android/telecom/ParcelableConference.aidl
similarity index 95%
rename from telecomm/java/android/telecomm/ParcelableConference.aidl
rename to telecomm/java/android/telecom/ParcelableConference.aidl
index a260085..155ba94 100644
--- a/telecomm/java/android/telecomm/ParcelableConference.aidl
+++ b/telecomm/java/android/telecom/ParcelableConference.aidl
@@ -14,6 +14,6 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
parcelable ParcelableConference;
diff --git a/telecomm/java/android/telecomm/ParcelableConference.java b/telecomm/java/android/telecom/ParcelableConference.java
similarity index 98%
rename from telecomm/java/android/telecomm/ParcelableConference.java
rename to telecomm/java/android/telecom/ParcelableConference.java
index b2798613..97c709c 100644
--- a/telecomm/java/android/telecomm/ParcelableConference.java
+++ b/telecomm/java/android/telecom/ParcelableConference.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/telecomm/java/android/telecomm/ParcelableConnection.aidl b/telecomm/java/android/telecom/ParcelableConnection.aidl
similarity index 96%
rename from telecomm/java/android/telecomm/ParcelableConnection.aidl
rename to telecomm/java/android/telecom/ParcelableConnection.aidl
index 143c5a6..e91ebc3 100644
--- a/telecomm/java/android/telecomm/ParcelableConnection.aidl
+++ b/telecomm/java/android/telecom/ParcelableConnection.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/ParcelableConnection.java b/telecomm/java/android/telecom/ParcelableConnection.java
similarity index 97%
rename from telecomm/java/android/telecomm/ParcelableConnection.java
rename to telecomm/java/android/telecom/ParcelableConnection.java
index cadcd85..63393b2 100644
--- a/telecomm/java/android/telecomm/ParcelableConnection.java
+++ b/telecomm/java/android/telecom/ParcelableConnection.java
@@ -14,20 +14,20 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.net.Uri;
import android.os.Parcel;
import android.os.Parcelable;
-import com.android.internal.telecomm.IVideoProvider;
+import com.android.internal.telecom.IVideoProvider;
import java.util.ArrayList;
import java.util.List;
/**
- * Information about a connection that is used between Telecomm and the ConnectionService.
- * This is used to send initial Connection information to Telecomm when the connection is
+ * Information about a connection that is used between Telecom and the ConnectionService.
+ * This is used to send initial Connection information to Telecom when the connection is
* first created.
* @hide
*/
diff --git a/telecomm/java/android/telecomm/Phone.java b/telecomm/java/android/telecom/Phone.java
similarity index 89%
rename from telecomm/java/android/telecomm/Phone.java
rename to telecomm/java/android/telecom/Phone.java
index 8831f8f..5131790 100644
--- a/telecomm/java/android/telecomm/Phone.java
+++ b/telecomm/java/android/telecom/Phone.java
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.annotation.SystemApi;
-import android.app.PendingIntent;
import android.util.ArrayMap;
import java.util.Collections;
@@ -77,8 +76,8 @@
public void onCallRemoved(Phone phone, Call call) { }
}
- // A Map allows us to track each Call by its Telecomm-specified call ID
- private final Map<String, Call> mCallByTelecommCallId = new ArrayMap<>();
+ // A Map allows us to track each Call by its Telecom-specified call ID
+ private final Map<String, Call> mCallByTelecomCallId = new ArrayMap<>();
// A List allows us to keep the Calls in a stable iteration order so that casually developed
// user interface components do not incur any spurious jank
@@ -101,32 +100,32 @@
/** {@hide} */
final void internalAddCall(ParcelableCall parcelableCall) {
Call call = new Call(this, parcelableCall.getId(), mInCallAdapter);
- mCallByTelecommCallId.put(parcelableCall.getId(), call);
+ mCallByTelecomCallId.put(parcelableCall.getId(), call);
mCalls.add(call);
checkCallTree(parcelableCall);
- call.internalUpdate(parcelableCall, mCallByTelecommCallId);
+ call.internalUpdate(parcelableCall, mCallByTelecomCallId);
fireCallAdded(call);
}
/** {@hide} */
final void internalRemoveCall(Call call) {
- mCallByTelecommCallId.remove(call.internalGetCallId());
+ mCallByTelecomCallId.remove(call.internalGetCallId());
mCalls.remove(call);
fireCallRemoved(call);
}
/** {@hide} */
final void internalUpdateCall(ParcelableCall parcelableCall) {
- Call call = mCallByTelecommCallId.get(parcelableCall.getId());
+ Call call = mCallByTelecomCallId.get(parcelableCall.getId());
if (call != null) {
checkCallTree(parcelableCall);
- call.internalUpdate(parcelableCall, mCallByTelecommCallId);
+ call.internalUpdate(parcelableCall, mCallByTelecomCallId);
}
}
/** {@hide} */
- final void internalSetPostDialWait(String telecommId, String remaining) {
- Call call = mCallByTelecommCallId.get(telecommId);
+ final void internalSetPostDialWait(String telecomId, String remaining) {
+ Call call = mCallByTelecomCallId.get(telecomId);
if (call != null) {
call.internalSetPostDialWait(remaining);
}
@@ -141,8 +140,8 @@
}
/** {@hide} */
- final Call internalGetCallByTelecommId(String telecommId) {
- return mCallByTelecommCallId.get(telecommId);
+ final Call internalGetCallByTelecomId(String telecomId) {
+ return mCallByTelecomCallId.get(telecomId);
}
/** {@hide} */
@@ -269,13 +268,13 @@
private void checkCallTree(ParcelableCall parcelableCall) {
if (parcelableCall.getParentCallId() != null &&
- !mCallByTelecommCallId.containsKey(parcelableCall.getParentCallId())) {
+ !mCallByTelecomCallId.containsKey(parcelableCall.getParentCallId())) {
Log.wtf(this, "ParcelableCall %s has nonexistent parent %s",
parcelableCall.getId(), parcelableCall.getParentCallId());
}
if (parcelableCall.getChildCallIds() != null) {
for (int i = 0; i < parcelableCall.getChildCallIds().size(); i++) {
- if (!mCallByTelecommCallId.containsKey(parcelableCall.getChildCallIds().get(i))) {
+ if (!mCallByTelecomCallId.containsKey(parcelableCall.getChildCallIds().get(i))) {
Log.wtf(this, "ParcelableCall %s has nonexistent child %s",
parcelableCall.getId(), parcelableCall.getChildCallIds().get(i));
}
diff --git a/telecomm/java/android/telecomm/PhoneAccount.aidl b/telecomm/java/android/telecom/PhoneAccount.aidl
similarity index 96%
rename from telecomm/java/android/telecomm/PhoneAccount.aidl
rename to telecomm/java/android/telecom/PhoneAccount.aidl
index 15377df..d5e6058 100644
--- a/telecomm/java/android/telecomm/PhoneAccount.aidl
+++ b/telecomm/java/android/telecom/PhoneAccount.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/PhoneAccount.java b/telecomm/java/android/telecom/PhoneAccount.java
similarity index 99%
rename from telecomm/java/android/telecomm/PhoneAccount.java
rename to telecomm/java/android/telecom/PhoneAccount.java
index b37c144..0c233ebb 100644
--- a/telecomm/java/android/telecomm/PhoneAccount.java
+++ b/telecomm/java/android/telecom/PhoneAccount.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.content.Context;
import android.content.pm.PackageManager;
diff --git a/telecomm/java/android/telecomm/PhoneAccountHandle.aidl b/telecomm/java/android/telecom/PhoneAccountHandle.aidl
similarity index 96%
rename from telecomm/java/android/telecomm/PhoneAccountHandle.aidl
rename to telecomm/java/android/telecom/PhoneAccountHandle.aidl
index 3be5a2e..f8f9656 100644
--- a/telecomm/java/android/telecomm/PhoneAccountHandle.aidl
+++ b/telecomm/java/android/telecom/PhoneAccountHandle.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/PhoneAccountHandle.java b/telecomm/java/android/telecom/PhoneAccountHandle.java
similarity index 96%
rename from telecomm/java/android/telecomm/PhoneAccountHandle.java
rename to telecomm/java/android/telecom/PhoneAccountHandle.java
index 04cd2b0..e13df76 100644
--- a/telecomm/java/android/telecomm/PhoneAccountHandle.java
+++ b/telecomm/java/android/telecom/PhoneAccountHandle.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.content.ComponentName;
import android.os.Parcel;
@@ -37,7 +37,7 @@
}
/**
- * The {@code ComponentName} of the {@link android.telecomm.ConnectionService} which is
+ * The {@code ComponentName} of the {@link android.telecom.ConnectionService} which is
* responsible for making phone calls using this {@code PhoneAccountHandle}.
*
* @return A suitable {@code ComponentName}.
diff --git a/telecomm/java/android/telecomm/PhoneCapabilities.java b/telecomm/java/android/telecom/PhoneCapabilities.java
similarity index 99%
rename from telecomm/java/android/telecomm/PhoneCapabilities.java
rename to telecomm/java/android/telecom/PhoneCapabilities.java
index ec11376..e73dfe2 100644
--- a/telecomm/java/android/telecomm/PhoneCapabilities.java
+++ b/telecomm/java/android/telecom/PhoneCapabilities.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* Defines capabilities a phone call can support, such as conference calling and video telephony.
diff --git a/telecomm/java/android/telecomm/RemoteConference.java b/telecomm/java/android/telecom/RemoteConference.java
similarity index 98%
rename from telecomm/java/android/telecomm/RemoteConference.java
rename to telecomm/java/android/telecom/RemoteConference.java
index dbff079..996e091 100644
--- a/telecomm/java/android/telecomm/RemoteConference.java
+++ b/telecomm/java/android/telecom/RemoteConference.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
-import com.android.internal.telecomm.IConnectionService;
+import com.android.internal.telecom.IConnectionService;
import android.os.RemoteException;
import android.telephony.DisconnectCause;
diff --git a/telecomm/java/android/telecomm/RemoteConnection.java b/telecomm/java/android/telecom/RemoteConnection.java
similarity index 97%
rename from telecomm/java/android/telecomm/RemoteConnection.java
rename to telecomm/java/android/telecom/RemoteConnection.java
index f3a6085..bf699b3 100644
--- a/telecomm/java/android/telecomm/RemoteConnection.java
+++ b/telecomm/java/android/telecom/RemoteConnection.java
@@ -14,13 +14,12 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
-import com.android.internal.telecomm.IConnectionService;
-import com.android.internal.telecomm.IVideoCallback;
-import com.android.internal.telecomm.IVideoProvider;
+import com.android.internal.telecom.IConnectionService;
+import com.android.internal.telecom.IVideoCallback;
+import com.android.internal.telecom.IVideoProvider;
-import android.app.PendingIntent;
import android.net.Uri;
import android.os.IBinder;
import android.os.RemoteException;
@@ -120,7 +119,7 @@
* @param connection The {@code RemoteConnection} invoking this method.
* @param address The new address of the {@code RemoteConnection}.
* @param presentation The presentation requirements for the address.
- * See {@link TelecommManager} for valid values.
+ * See {@link TelecomManager} for valid values.
*/
public void onAddressChanged(RemoteConnection connection, Uri address, int presentation) {}
@@ -131,7 +130,7 @@
* @param connection The {@code RemoteConnection} invoking this method.
* @param callerDisplayName The new caller display name of the {@code RemoteConnection}.
* @param presentation The presentation requirements for the handle.
- * See {@link TelecommManager} for valid values.
+ * See {@link TelecomManager} for valid values.
*/
public void onCallerDisplayNameChanged(
RemoteConnection connection, String callerDisplayName, int presentation) {}
@@ -508,7 +507,7 @@
}
/**
- * @return The presentation requirements for the address. See {@link TelecommManager} for valid
+ * @return The presentation requirements for the address. See {@link TelecomManager} for valid
* values.
*/
public int getAddressPresentation() {
@@ -524,7 +523,7 @@
/**
* @return The presentation requirements for the caller display name. See
- * {@link TelecommManager} for valid values.
+ * {@link TelecomManager} for valid values.
*/
public int getCallerDisplayNamePresentation() {
return mCallerDisplayNamePresentation;
@@ -694,15 +693,15 @@
* Instructs this {@code RemoteConnection} to continue playing a post-dial DTMF string.
*
* A post-dial DTMF string is a string of digits following the first instance of either
- * {@link TelecommManager#DTMF_CHARACTER_WAIT} or {@link TelecommManager#DTMF_CHARACTER_PAUSE}.
+ * {@link TelecomManager#DTMF_CHARACTER_WAIT} or {@link TelecomManager#DTMF_CHARACTER_PAUSE}.
* These digits are immediately sent as DTMF tones to the recipient as soon as the
* connection is made.
*
- * If the DTMF string contains a {@link TelecommManager#DTMF_CHARACTER_PAUSE} symbol, this
+ * If the DTMF string contains a {@link TelecomManager#DTMF_CHARACTER_PAUSE} symbol, this
* {@code RemoteConnection} will temporarily pause playing the tones for a pre-defined period
* of time.
*
- * If the DTMF string contains a {@link TelecommManager#DTMF_CHARACTER_WAIT} symbol, this
+ * If the DTMF string contains a {@link TelecomManager#DTMF_CHARACTER_WAIT} symbol, this
* {@code RemoteConnection} will pause playing the tones and notify callbackss via
* {@link Callback#onPostDialWait(RemoteConnection, String)}. At this point, the in-call app
* should display to the user an indication of this state and an affordance to continue
diff --git a/telecomm/java/android/telecomm/RemoteConnectionManager.java b/telecomm/java/android/telecom/RemoteConnectionManager.java
similarity index 97%
rename from telecomm/java/android/telecomm/RemoteConnectionManager.java
rename to telecomm/java/android/telecom/RemoteConnectionManager.java
index 83502c5..0366509 100644
--- a/telecomm/java/android/telecomm/RemoteConnectionManager.java
+++ b/telecomm/java/android/telecom/RemoteConnectionManager.java
@@ -14,12 +14,12 @@
R* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.content.ComponentName;
import android.os.RemoteException;
-import com.android.internal.telecomm.IConnectionService;
+import com.android.internal.telecom.IConnectionService;
import java.util.HashMap;
import java.util.Map;
diff --git a/telecomm/java/android/telecomm/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java
similarity index 97%
rename from telecomm/java/android/telecomm/RemoteConnectionService.java
rename to telecomm/java/android/telecom/RemoteConnectionService.java
index d4dd9af..bfd7c51 100644
--- a/telecomm/java/android/telecomm/RemoteConnectionService.java
+++ b/telecomm/java/android/telecom/RemoteConnectionService.java
@@ -14,19 +14,18 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
-import android.app.PendingIntent;
import android.net.Uri;
import android.os.IBinder;
import android.os.IBinder.DeathRecipient;
import android.os.RemoteException;
import android.telephony.DisconnectCause;
-import com.android.internal.telecomm.IConnectionService;
-import com.android.internal.telecomm.IConnectionServiceAdapter;
-import com.android.internal.telecomm.IVideoProvider;
-import com.android.internal.telecomm.RemoteServiceCallback;
+import com.android.internal.telecom.IConnectionService;
+import com.android.internal.telecom.IConnectionServiceAdapter;
+import com.android.internal.telecom.IVideoProvider;
+import com.android.internal.telecom.RemoteServiceCallback;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/telecomm/java/android/telecomm/Response.java b/telecomm/java/android/telecom/Response.java
similarity index 97%
rename from telecomm/java/android/telecomm/Response.java
rename to telecomm/java/android/telecom/Response.java
index ad78ebd..ce7a761 100644
--- a/telecomm/java/android/telecomm/Response.java
+++ b/telecomm/java/android/telecom/Response.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* @hide
diff --git a/telecomm/java/android/telecomm/StatusHints.aidl b/telecomm/java/android/telecom/StatusHints.aidl
similarity index 96%
rename from telecomm/java/android/telecomm/StatusHints.aidl
rename to telecomm/java/android/telecom/StatusHints.aidl
index 22da293..ae7df2e 100644
--- a/telecomm/java/android/telecomm/StatusHints.aidl
+++ b/telecomm/java/android/telecom/StatusHints.aidl
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/StatusHints.java b/telecomm/java/android/telecom/StatusHints.java
similarity index 99%
rename from telecomm/java/android/telecomm/StatusHints.java
rename to telecomm/java/android/telecom/StatusHints.java
index ff96a5b..a32eae7 100644
--- a/telecomm/java/android/telecomm/StatusHints.java
+++ b/telecomm/java/android/telecom/StatusHints.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import android.content.ComponentName;
import android.content.Context;
diff --git a/telecomm/java/android/telecomm/TelecommManager.java b/telecomm/java/android/telecom/TelecomManager.java
similarity index 78%
rename from telecomm/java/android/telecomm/TelecommManager.java
rename to telecomm/java/android/telecom/TelecomManager.java
index e2c98cd..1f5be6e 100644
--- a/telecomm/java/android/telecomm/TelecommManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -12,7 +12,7 @@
* the License.
*/
-package android.telecomm;
+package android.telecom;
import android.annotation.SystemApi;
import android.content.ComponentName;
@@ -22,57 +22,57 @@
import android.os.ServiceManager;
import android.util.Log;
-import com.android.internal.telecomm.ITelecommService;
+import com.android.internal.telecom.ITelecomService;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
- * Provides access to Telecomm-related functionality.
+ * Provides access to Telecom-related functionality.
* TODO: Move this all into PhoneManager.
*/
-public class TelecommManager {
+public class TelecomManager {
/**
* 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
+ * UI by notifying the Telecom system that an incoming call exists for a specific call service
+ * (see {@link android.telecom.ConnectionService}). Telecom reads the Intent extras to find
+ * and bind to the appropriate {@link android.telecom.ConnectionService} which Telecom will
* ultimately use to control and get information about the call.
* <p>
* Input: get*Extra field {@link #EXTRA_PHONE_ACCOUNT_HANDLE} contains the component name of the
- * {@link android.telecomm.ConnectionService} that Telecomm should bind to. Telecomm will then
+ * {@link android.telecom.ConnectionService} that Telecom should bind to. Telecom will then
* ask the connection service for more information about the call prior to showing any UI.
*
* @hide
*/
- public static final String ACTION_INCOMING_CALL = "android.telecomm.action.INCOMING_CALL";
+ public static final String ACTION_INCOMING_CALL = "android.telecom.action.INCOMING_CALL";
/**
* The {@link android.content.Intent} action used to configure a
- * {@link android.telecomm.ConnectionService}.
+ * {@link android.telecom.ConnectionService}.
*/
public static final String ACTION_CONNECTION_SERVICE_CONFIGURE =
- "android.telecomm.action.CONNECTION_SERVICE_CONFIGURE";
+ "android.telecom.action.CONNECTION_SERVICE_CONFIGURE";
/**
* The {@link android.content.Intent} action used to show the call settings page.
*/
public static final String ACTION_SHOW_CALL_SETTINGS =
- "android.telecomm.action.SHOW_CALL_SETTINGS";
+ "android.telecom.action.SHOW_CALL_SETTINGS";
/**
* The {@link android.content.Intent} action used to show the settings page used to configure
* {@link PhoneAccount} preferences.
*/
public static final String ACTION_CHANGE_PHONE_ACCOUNTS =
- "android.telecomm.action.CHANGE_PHONE_ACCOUNTS";
+ "android.telecom.action.CHANGE_PHONE_ACCOUNTS";
/**
* The {@link android.content.Intent} action used to inform a
- * {@link android.telecomm.ConnectionService} that one of its {@link PhoneAccount}s has been
- * enabled. The {@link TelecommManager#EXTRA_PHONE_ACCOUNT_HANDLE} extra is used to indicate
+ * {@link android.telecom.ConnectionService} that one of its {@link PhoneAccount}s has been
+ * enabled. The {@link TelecomManager#EXTRA_PHONE_ACCOUNT_HANDLE} extra is used to indicate
* which {@link PhoneAccount} has been enabled.
*/
public static final String ACTION_PHONE_ACCOUNT_ENABLED =
@@ -80,8 +80,8 @@
/**
* The {@link android.content.Intent} action used to inform a
- * {@link android.telecomm.ConnectionService} that one of its {@link PhoneAccount}s has been
- * disabled. The {@link TelecommManager#EXTRA_PHONE_ACCOUNT_HANDLE} extra is used to indicate
+ * {@link android.telecom.ConnectionService} that one of its {@link PhoneAccount}s has been
+ * disabled. The {@link TelecomManager#EXTRA_PHONE_ACCOUNT_HANDLE} extra is used to indicate
* which {@link PhoneAccount} has been disabled.
*/
public static final String ACTION_PHONE_ACCOUNT_DISABLED =
@@ -92,7 +92,7 @@
* determines whether the speakerphone should be automatically turned on for an outgoing call.
*/
public static final String EXTRA_START_CALL_WITH_SPEAKERPHONE =
- "android.telecomm.extra.START_CALL_WITH_SPEAKERPHONE";
+ "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
/**
* Optional extra for {@link android.content.Intent#ACTION_CALL} containing an integer that
@@ -105,7 +105,7 @@
* @hide
*/
public static final String EXTRA_START_CALL_WITH_VIDEO_STATE =
- "android.telecomm.extra.START_CALL_WITH_VIDEO_STATE";
+ "android.telecom.extra.START_CALL_WITH_VIDEO_STATE";
/**
* The extra used with an {@link android.content.Intent#ACTION_CALL} and
@@ -115,7 +115,7 @@
* Retrieve with {@link android.content.Intent#getParcelableExtra(String)}.
*/
public static final String EXTRA_PHONE_ACCOUNT_HANDLE =
- "android.telecomm.extra.PHONE_ACCOUNT_HANDLE";
+ "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
/**
* Optional extra for {@link #ACTION_INCOMING_CALL} containing a {@link Bundle} which contains
@@ -125,7 +125,7 @@
* @hide
*/
public static final String EXTRA_INCOMING_CALL_EXTRAS =
- "android.telecomm.extra.INCOMING_CALL_EXTRAS";
+ "android.telecom.extra.INCOMING_CALL_EXTRAS";
/**
* Optional extra for {@link android.content.Intent#ACTION_CALL} and
@@ -136,28 +136,28 @@
* @hide
*/
public static final String EXTRA_OUTGOING_CALL_EXTRAS =
- "android.telecomm.extra.OUTGOING_CALL_EXTRAS";
+ "android.telecom.extra.OUTGOING_CALL_EXTRAS";
/**
* Optional extra for {@link android.telephony.TelephonyManager#ACTION_PHONE_STATE_CHANGED}
* containing the disconnect code.
*/
public static final String EXTRA_CALL_DISCONNECT_CAUSE =
- "android.telecomm.extra.CALL_DISCONNECT_CAUSE";
+ "android.telecom.extra.CALL_DISCONNECT_CAUSE";
/**
* Optional extra for {@link android.telephony.TelephonyManager#ACTION_PHONE_STATE_CHANGED}
* containing the disconnect message.
*/
public static final String EXTRA_CALL_DISCONNECT_MESSAGE =
- "android.telecomm.extra.CALL_DISCONNECT_MESSAGE";
+ "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
/**
* Optional extra for {@link android.telephony.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";
+ "android.telecom.extra.CONNECTION_SERVICE";
/**
* An optional {@link android.content.Intent#ACTION_CALL} intent extra denoting the
@@ -170,7 +170,7 @@
* the user. This alternative address is referred to as the gateway address.
*/
public static final String GATEWAY_PROVIDER_PACKAGE =
- "android.telecomm.extra.GATEWAY_PROVIDER_PACKAGE";
+ "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE";
/**
* An optional {@link android.content.Intent#ACTION_CALL} intent extra corresponding to the
@@ -181,7 +181,7 @@
* (See {@link #GATEWAY_PROVIDER_PACKAGE} for details)
*/
public static final String GATEWAY_ORIGINAL_ADDRESS =
- "android.telecomm.extra.GATEWAY_ORIGINAL_ADDRESS";
+ "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS";
/**
* The number which the party on the other side of the line will see (and use to return the
@@ -191,7 +191,7 @@
* 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";
+ public static final String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
/**
* The dual tone multi-frequency signaling character sent to indicate the dialing system should
@@ -246,7 +246,7 @@
* @hide
*/
public static final String ACTION_CURRENT_TTY_MODE_CHANGED =
- "android.telecomm.action.CURRENT_TTY_MODE_CHANGED";
+ "android.telecom.action.CURRENT_TTY_MODE_CHANGED";
/**
* The lookup key for an int that indicates the current TTY mode.
@@ -259,7 +259,7 @@
* @hide
*/
public static final String EXTRA_CURRENT_TTY_MODE =
- "android.telecomm.intent.extra.CURRENT_TTY_MODE";
+ "android.telecom.intent.extra.CURRENT_TTY_MODE";
/**
* Broadcast intent action indicating that the TTY preferred operating mode has changed. An
@@ -269,7 +269,7 @@
* @hide
*/
public static final String ACTION_TTY_PREFERRED_MODE_CHANGED =
- "android.telecomm.action.TTY_PREFERRED_MODE_CHANGED";
+ "android.telecom.action.TTY_PREFERRED_MODE_CHANGED";
/**
* The lookup key for an int that indicates preferred TTY mode. Valid modes are: -
@@ -279,7 +279,7 @@
* @hide
*/
public static final String EXTRA_TTY_PREFERRED_MODE =
- "android.telecomm.intent.extra.TTY_PREFERRED";
+ "android.telecom.intent.extra.TTY_PREFERRED";
/**
* The following 4 constants define how properties such as phone numbers and names are
@@ -298,23 +298,21 @@
/** Property should be displayed as a pay phone. */
public static final int PRESENTATION_PAYPHONE = 4;
- private static final String TAG = "TelecommManager";
-
- private static final String TELECOMM_SERVICE_NAME = "telecomm";
+ private static final String TAG = "TelecomManager";
private final Context mContext;
/**
* @hide
*/
- public static TelecommManager from(Context context) {
- return (TelecommManager) context.getSystemService(Context.TELECOMM_SERVICE);
+ public static TelecomManager from(Context context) {
+ return (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
}
/**
* @hide
*/
- public TelecommManager(Context context) {
+ public TelecomManager(Context context) {
Context appContext = context.getApplicationContext();
if (appContext != null) {
mContext = appContext;
@@ -332,11 +330,11 @@
* exists no user-chosen default {@code PhoneAccount}. In this case, apps wishing to initiate a
* phone call must either create their {@link android.content.Intent#ACTION_CALL} or
* {@link android.content.Intent#ACTION_DIAL} {@code Intent} with no
- * {@link TelecommManager#EXTRA_PHONE_ACCOUNT_HANDLE}, or present the user with an affordance to
+ * {@link TelecomManager#EXTRA_PHONE_ACCOUNT_HANDLE}, or present the user with an affordance to
* select one of the elements of {@link #getEnabledPhoneAccounts()}.
* <p>
* An {@link android.content.Intent#ACTION_CALL} or {@link android.content.Intent#ACTION_DIAL}
- * {@code Intent} with no {@link TelecommManager#EXTRA_PHONE_ACCOUNT_HANDLE} is valid, and
+ * {@code Intent} with no {@link TelecomManager#EXTRA_PHONE_ACCOUNT_HANDLE} is valid, and
* subsequent steps in the phone call flow are responsible for presenting the user with an
* affordance, if necessary, to choose a {@code PhoneAccount}.
*
@@ -345,10 +343,10 @@
public PhoneAccountHandle getDefaultOutgoingPhoneAccount(String uriScheme) {
try {
if (isServiceConnected()) {
- return getTelecommService().getDefaultOutgoingPhoneAccount(uriScheme);
+ return getTelecomService().getDefaultOutgoingPhoneAccount(uriScheme);
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getDefaultOutgoingPhoneAccount", e);
+ Log.e(TAG, "Error calling ITelecomService#getDefaultOutgoingPhoneAccount", e);
}
return null;
}
@@ -367,10 +365,10 @@
public PhoneAccountHandle getUserSelectedOutgoingPhoneAccount() {
try {
if (isServiceConnected()) {
- return getTelecommService().getUserSelectedOutgoingPhoneAccount();
+ return getTelecomService().getUserSelectedOutgoingPhoneAccount();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getUserSelectedOutgoingPhoneAccount", e);
+ Log.e(TAG, "Error calling ITelecomService#getUserSelectedOutgoingPhoneAccount", e);
}
return null;
}
@@ -382,10 +380,10 @@
public void setUserSelectedOutgoingPhoneAccount(PhoneAccountHandle accountHandle) {
try {
if (isServiceConnected()) {
- getTelecommService().setUserSelectedOutgoingPhoneAccount(accountHandle);
+ getTelecomService().setUserSelectedOutgoingPhoneAccount(accountHandle);
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#setUserSelectedOutgoingPhoneAccount");
+ Log.e(TAG, "Error calling ITelecomService#setUserSelectedOutgoingPhoneAccount");
}
}
@@ -399,10 +397,10 @@
public List<PhoneAccountHandle> getEnabledPhoneAccounts() {
try {
if (isServiceConnected()) {
- return getTelecommService().getEnabledPhoneAccounts();
+ return getTelecomService().getEnabledPhoneAccounts();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getEnabledPhoneAccounts", e);
+ Log.e(TAG, "Error calling ITelecomService#getEnabledPhoneAccounts", e);
}
return new ArrayList<>();
}
@@ -417,10 +415,10 @@
public PhoneAccountHandle getSimCallManager() {
try {
if (isServiceConnected()) {
- return getTelecommService().getSimCallManager();
+ return getTelecomService().getSimCallManager();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getSimCallManager");
+ Log.e(TAG, "Error calling ITelecomService#getSimCallManager");
}
return null;
}
@@ -433,10 +431,10 @@
public void setSimCallManager(PhoneAccountHandle accountHandle) {
try {
if (isServiceConnected()) {
- getTelecommService().setSimCallManager(accountHandle);
+ getTelecomService().setSimCallManager(accountHandle);
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#setSimCallManager");
+ Log.e(TAG, "Error calling ITelecomService#setSimCallManager");
}
}
@@ -448,10 +446,10 @@
public List<PhoneAccountHandle> getSimCallManagers() {
try {
if (isServiceConnected()) {
- return getTelecommService().getSimCallManagers();
+ return getTelecomService().getSimCallManagers();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getSimCallManagers");
+ Log.e(TAG, "Error calling ITelecomService#getSimCallManagers");
}
return new ArrayList<>();
}
@@ -482,10 +480,10 @@
public List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(String uriScheme) {
try {
if (isServiceConnected()) {
- return getTelecommService().getPhoneAccountsSupportingScheme(uriScheme);
+ return getTelecomService().getPhoneAccountsSupportingScheme(uriScheme);
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getPhoneAccountsSupportingScheme", e);
+ Log.e(TAG, "Error calling ITelecomService#getPhoneAccountsSupportingScheme", e);
}
return new ArrayList<>();
}
@@ -510,10 +508,10 @@
public PhoneAccount getPhoneAccount(PhoneAccountHandle account) {
try {
if (isServiceConnected()) {
- return getTelecommService().getPhoneAccount(account);
+ return getTelecomService().getPhoneAccount(account);
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getPhoneAccount", e);
+ Log.e(TAG, "Error calling ITelecomService#getPhoneAccount", e);
}
return null;
}
@@ -528,10 +526,10 @@
public int getAllPhoneAccountsCount() {
try {
if (isServiceConnected()) {
- return getTelecommService().getAllPhoneAccountsCount();
+ return getTelecomService().getAllPhoneAccountsCount();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getAllPhoneAccountsCount", e);
+ Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountsCount", e);
}
return 0;
}
@@ -546,10 +544,10 @@
public List<PhoneAccount> getAllPhoneAccounts() {
try {
if (isServiceConnected()) {
- return getTelecommService().getAllPhoneAccounts();
+ return getTelecomService().getAllPhoneAccounts();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getAllPhoneAccounts", e);
+ Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccounts", e);
}
return Collections.EMPTY_LIST;
}
@@ -564,10 +562,10 @@
public List<PhoneAccountHandle> getAllPhoneAccountHandles() {
try {
if (isServiceConnected()) {
- return getTelecommService().getAllPhoneAccountHandles();
+ return getTelecomService().getAllPhoneAccountHandles();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#getAllPhoneAccountHandles", e);
+ Log.e(TAG, "Error calling ITelecomService#getAllPhoneAccountHandles", e);
}
return Collections.EMPTY_LIST;
}
@@ -583,10 +581,10 @@
public void setPhoneAccountEnabled(PhoneAccountHandle account, boolean isEnabled) {
try {
if (isServiceConnected()) {
- getTelecommService().setPhoneAccountEnabled(account, isEnabled);
+ getTelecomService().setPhoneAccountEnabled(account, isEnabled);
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#setPhoneAccountEnabled", e);
+ Log.e(TAG, "Error calling ITelecomService#setPhoneAccountEnabled", e);
}
}
@@ -598,10 +596,10 @@
public void registerPhoneAccount(PhoneAccount account) {
try {
if (isServiceConnected()) {
- getTelecommService().registerPhoneAccount(account);
+ getTelecomService().registerPhoneAccount(account);
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#registerPhoneAccount", e);
+ Log.e(TAG, "Error calling ITelecomService#registerPhoneAccount", e);
}
}
@@ -613,10 +611,10 @@
public void unregisterPhoneAccount(PhoneAccountHandle accountHandle) {
try {
if (isServiceConnected()) {
- getTelecommService().unregisterPhoneAccount(accountHandle);
+ getTelecomService().unregisterPhoneAccount(accountHandle);
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#unregisterPhoneAccount", e);
+ Log.e(TAG, "Error calling ITelecomService#unregisterPhoneAccount", e);
}
}
@@ -627,10 +625,10 @@
public void clearAccounts() {
try {
if (isServiceConnected()) {
- getTelecommService().clearAccounts(mContext.getPackageName());
+ getTelecomService().clearAccounts(mContext.getPackageName());
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#clearAccounts", e);
+ Log.e(TAG, "Error calling ITelecomService#clearAccounts", e);
}
}
@@ -641,7 +639,7 @@
public ComponentName getDefaultPhoneApp() {
try {
if (isServiceConnected()) {
- return getTelecommService().getDefaultPhoneApp();
+ return getTelecomService().getDefaultPhoneApp();
}
} catch (RemoteException e) {
Log.e(TAG, "RemoteException attempting to get the default phone app.", e);
@@ -660,7 +658,7 @@
public boolean isInCall() {
try {
if (isServiceConnected()) {
- return getTelecommService().isInCall();
+ return getTelecomService().isInCall();
}
} catch (RemoteException e) {
Log.e(TAG, "RemoteException attempting to get default phone app.", e);
@@ -677,7 +675,7 @@
public boolean isRinging() {
try {
if (isServiceConnected()) {
- return getTelecommService().isRinging();
+ return getTelecomService().isRinging();
}
} catch (RemoteException e) {
Log.e(TAG, "RemoteException attempting to get ringing state of phone app.", e);
@@ -687,7 +685,7 @@
/**
* Ends an ongoing call.
- * TODO: L-release - need to convert all invocations of ITelecommService#endCall to use this
+ * TODO: L-release - need to convert all invocations of ITelecomService#endCall to use this
* method (clockwork & gearhead).
* @hide
*/
@@ -695,17 +693,17 @@
public boolean endCall() {
try {
if (isServiceConnected()) {
- return getTelecommService().endCall();
+ return getTelecomService().endCall();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#endCall", e);
+ Log.e(TAG, "Error calling ITelecomService#endCall", e);
}
return false;
}
/**
* If there is a ringing incoming call, this method accepts the call on behalf of the user.
- * TODO: L-release - need to convert all invocation of ITelecommService#answerRingingCall to use
+ * TODO: L-release - need to convert all invocation of ITelecmmService#answerRingingCall to use
* this method (clockwork & gearhead).
*
* @hide
@@ -714,10 +712,10 @@
public void acceptRingingCall() {
try {
if (isServiceConnected()) {
- getTelecommService().acceptRingingCall();
+ getTelecomService().acceptRingingCall();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#acceptRingingCall", e);
+ Log.e(TAG, "Error calling ITelecomService#acceptRingingCall", e);
}
}
@@ -730,10 +728,10 @@
public void silenceRinger() {
try {
if (isServiceConnected()) {
- getTelecommService().silenceRinger();
+ getTelecomService().silenceRinger();
}
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#silenceRinger", e);
+ Log.e(TAG, "Error calling ITelecomService#silenceRinger", e);
}
}
@@ -746,7 +744,7 @@
public boolean isTtySupported() {
try {
if (isServiceConnected()) {
- return getTelecommService().isTtySupported();
+ return getTelecomService().isTtySupported();
}
} catch (RemoteException e) {
Log.e(TAG, "RemoteException attempting to get TTY supported state.", e);
@@ -758,16 +756,16 @@
* Returns the current TTY mode of the device. For TTY to be on the user must enable it in
* settings and have a wired headset plugged in.
* Valid modes are:
- * - {@link TelecommManager#TTY_MODE_OFF}
- * - {@link TelecommManager#TTY_MODE_FULL}
- * - {@link TelecommManager#TTY_MODE_HCO}
- * - {@link TelecommManager#TTY_MODE_VCO}
+ * - {@link TelecomManager#TTY_MODE_OFF}
+ * - {@link TelecomManager#TTY_MODE_FULL}
+ * - {@link TelecomManager#TTY_MODE_HCO}
+ * - {@link TelecomManager#TTY_MODE_VCO}
* @hide
*/
public int getCurrentTtyMode() {
try {
if (isServiceConnected()) {
- return getTelecommService().getCurrentTtyMode();
+ return getTelecomService().getCurrentTtyMode();
}
} catch (RemoteException e) {
Log.e(TAG, "RemoteException attempting to get the current TTY mode.", e);
@@ -792,7 +790,7 @@
public void addNewIncomingCall(PhoneAccountHandle phoneAccount, Bundle extras) {
try {
if (isServiceConnected()) {
- getTelecommService().addNewIncomingCall(
+ getTelecomService().addNewIncomingCall(
phoneAccount, extras == null ? new Bundle() : extras);
}
} catch (RemoteException e) {
@@ -812,12 +810,12 @@
* @return True if the digits were processed as an MMI code, false otherwise.
*/
public boolean handleMmi(String dialString) {
- ITelecommService service = getTelecommService();
+ ITelecomService service = getTelecomService();
if (service != null) {
try {
return service.handlePinMmi(dialString);
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#handlePinMmi", e);
+ Log.e(TAG, "Error calling ITelecomService#handlePinMmi", e);
}
}
return false;
@@ -830,12 +828,12 @@
* </p>
*/
public void cancelMissedCallsNotification() {
- ITelecommService service = getTelecommService();
+ ITelecomService service = getTelecomService();
if (service != null) {
try {
service.cancelMissedCallsNotification();
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#cancelMissedCallsNotification", e);
+ Log.e(TAG, "Error calling ITelecomService#cancelMissedCallsNotification", e);
}
}
}
@@ -851,24 +849,24 @@
* @param showDialpad Brings up the in-call dialpad as part of showing the in-call screen.
*/
public void showInCallScreen(boolean showDialpad) {
- ITelecommService service = getTelecommService();
+ ITelecomService service = getTelecomService();
if (service != null) {
try {
service.showInCallScreen(showDialpad);
} catch (RemoteException e) {
- Log.e(TAG, "Error calling ITelecommService#showCallScreen", e);
+ Log.e(TAG, "Error calling ITelecomService#showCallScreen", e);
}
}
}
- private ITelecommService getTelecommService() {
- return ITelecommService.Stub.asInterface(ServiceManager.getService(TELECOMM_SERVICE_NAME));
+ private ITelecomService getTelecomService() {
+ return ITelecomService.Stub.asInterface(ServiceManager.getService(Context.TELECOM_SERVICE));
}
private boolean isServiceConnected() {
- boolean isConnected = getTelecommService() != null;
+ boolean isConnected = getTelecomService() != null;
if (!isConnected) {
- Log.w(TAG, "Telecomm Service not found.");
+ Log.w(TAG, "Telecom Service not found.");
}
return isConnected;
}
diff --git a/telecomm/java/android/telecomm/VideoCallImpl.java b/telecomm/java/android/telecom/VideoCallImpl.java
similarity index 97%
rename from telecomm/java/android/telecomm/VideoCallImpl.java
rename to telecomm/java/android/telecom/VideoCallImpl.java
index d33a351..925058e 100644
--- a/telecomm/java/android/telecomm/VideoCallImpl.java
+++ b/telecomm/java/android/telecom/VideoCallImpl.java
@@ -14,19 +14,19 @@
* limitations under the License
*/
-package android.telecomm;
+package android.telecom;
import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
-import android.telecomm.InCallService.VideoCall;
+import android.telecom.InCallService.VideoCall;
import android.view.Surface;
import com.android.internal.os.SomeArgs;
-import com.android.internal.telecomm.IVideoCallback;
-import com.android.internal.telecomm.IVideoProvider;
+import com.android.internal.telecom.IVideoCallback;
+import com.android.internal.telecom.IVideoProvider;
/**
* Implementation of a Video Call, which allows InCallUi to communicate commands to the underlying
diff --git a/telecomm/java/android/telecomm/VideoCallbackServant.java b/telecomm/java/android/telecom/VideoCallbackServant.java
similarity index 98%
rename from telecomm/java/android/telecomm/VideoCallbackServant.java
rename to telecomm/java/android/telecom/VideoCallbackServant.java
index 060b8a9..d0e3f22 100644
--- a/telecomm/java/android/telecomm/VideoCallbackServant.java
+++ b/telecomm/java/android/telecom/VideoCallbackServant.java
@@ -14,10 +14,10 @@
R* limitations under the License.
*/
-package android.telecomm;
+package android.telecom;
import com.android.internal.os.SomeArgs;
-import com.android.internal.telecomm.IVideoCallback;
+import com.android.internal.telecom.IVideoCallback;
import android.os.Handler;
import android.os.Message;
diff --git a/telecomm/java/android/telecomm/VideoProfile.aidl b/telecomm/java/android/telecom/VideoProfile.aidl
similarity index 96%
rename from telecomm/java/android/telecomm/VideoProfile.aidl
rename to telecomm/java/android/telecom/VideoProfile.aidl
index e756fa7..091b569 100644
--- a/telecomm/java/android/telecomm/VideoProfile.aidl
+++ b/telecomm/java/android/telecom/VideoProfile.aidl
@@ -15,7 +15,7 @@
*/
-package android.telecomm;
+package android.telecom;
/**
* {@hide}
diff --git a/telecomm/java/android/telecomm/VideoProfile.java b/telecomm/java/android/telecom/VideoProfile.java
similarity index 99%
rename from telecomm/java/android/telecomm/VideoProfile.java
rename to telecomm/java/android/telecom/VideoProfile.java
index 028d24e..f5cb054 100644
--- a/telecomm/java/android/telecomm/VideoProfile.java
+++ b/telecomm/java/android/telecom/VideoProfile.java
@@ -14,7 +14,7 @@
* limitations under the License
*/
-package android.telecomm;
+package android.telecom;
import android.os.Parcel;
import android.os.Parcelable;