diff options
| -rw-r--r-- | Android.mk | 16 | ||||
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | api/current.txt | 182 | ||||
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 8 | ||||
| -rw-r--r-- | core/java/android/content/Context.java | 8 | ||||
| -rw-r--r-- | core/java/android/provider/CallLog.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/widget/LockPatternUtils.java | 6 | ||||
| -rw-r--r-- | media/java/android/media/AudioService.java | 9 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java | 4 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java | 12 | ||||
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 52 | ||||
| -rw-r--r-- | services/core/java/com/android/server/notification/ZenModeHelper.java | 6 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/AudioState.aidl (renamed from telecomm/java/android/telecomm/AudioState.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/AudioState.java (renamed from telecomm/java/android/telecomm/AudioState.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Call.java (renamed from telecomm/java/android/telecomm/Call.java) | 51 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/CallProperties.java (renamed from telecomm/java/android/telecomm/CallProperties.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/CallState.java (renamed from telecomm/java/android/telecomm/CallState.java) | 4 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/CameraCapabilities.aidl (renamed from telecomm/java/android/telecomm/CameraCapabilities.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/CameraCapabilities.java (renamed from telecomm/java/android/telecomm/CameraCapabilities.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Conference.java (renamed from telecomm/java/android/telecomm/Conference.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java (renamed from telecomm/java/android/telecomm/Connection.java) | 15 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ConnectionRequest.aidl (renamed from telecomm/java/android/telecomm/ConnectionRequest.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ConnectionRequest.java (renamed from telecomm/java/android/telecomm/ConnectionRequest.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ConnectionService.java (renamed from telecomm/java/android/telecomm/ConnectionService.java) | 17 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ConnectionServiceAdapter.java (renamed from telecomm/java/android/telecomm/ConnectionServiceAdapter.java) | 11 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ConnectionServiceAdapterServant.java (renamed from telecomm/java/android/telecomm/ConnectionServiceAdapterServant.java) | 9 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/GatewayInfo.aidl (renamed from telecomm/java/android/telecomm/GatewayInfo.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/GatewayInfo.java (renamed from telecomm/java/android/telecomm/GatewayInfo.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/InCallAdapter.java (renamed from telecomm/java/android/telecomm/InCallAdapter.java) | 42 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/InCallService.java (renamed from telecomm/java/android/telecomm/InCallService.java) | 11 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Log.java (renamed from telecomm/java/android/telecomm/Log.java) | 6 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ParcelableCall.aidl (renamed from telecomm/java/android/telecomm/ParcelableCall.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ParcelableCall.java (renamed from telecomm/java/android/telecomm/ParcelableCall.java) | 10 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ParcelableConference.aidl (renamed from telecomm/java/android/telecomm/ParcelableConference.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ParcelableConference.java (renamed from telecomm/java/android/telecomm/ParcelableConference.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ParcelableConnection.aidl (renamed from telecomm/java/android/telecomm/ParcelableConnection.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/ParcelableConnection.java (renamed from telecomm/java/android/telecomm/ParcelableConnection.java) | 8 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Phone.java (renamed from telecomm/java/android/telecomm/Phone.java) | 29 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccount.aidl (renamed from telecomm/java/android/telecomm/PhoneAccount.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccount.java (renamed from telecomm/java/android/telecomm/PhoneAccount.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccountHandle.aidl (renamed from telecomm/java/android/telecomm/PhoneAccountHandle.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/PhoneAccountHandle.java (renamed from telecomm/java/android/telecomm/PhoneAccountHandle.java) | 4 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/PhoneCapabilities.java (renamed from telecomm/java/android/telecomm/PhoneCapabilities.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConference.java (renamed from telecomm/java/android/telecomm/RemoteConference.java) | 4 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnection.java (renamed from telecomm/java/android/telecomm/RemoteConnection.java) | 23 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnectionManager.java (renamed from telecomm/java/android/telecomm/RemoteConnectionManager.java) | 4 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/RemoteConnectionService.java (renamed from telecomm/java/android/telecomm/RemoteConnectionService.java) | 11 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Response.java (renamed from telecomm/java/android/telecomm/Response.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/StatusHints.aidl (renamed from telecomm/java/android/telecomm/StatusHints.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/StatusHints.java (renamed from telecomm/java/android/telecomm/StatusHints.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/TelecomManager.java (renamed from telecomm/java/android/telecomm/TelecommManager.java) | 198 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/VideoCallImpl.java (renamed from telecomm/java/android/telecomm/VideoCallImpl.java) | 8 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/VideoCallbackServant.java (renamed from telecomm/java/android/telecomm/VideoCallbackServant.java) | 4 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/VideoProfile.aidl (renamed from telecomm/java/android/telecomm/VideoProfile.aidl) | 2 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/VideoProfile.java (renamed from telecomm/java/android/telecomm/VideoProfile.java) | 2 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecom/IConnectionService.aidl (renamed from telecomm/java/com/android/internal/telecomm/IConnectionService.aidl) | 12 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl (renamed from telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl) | 16 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl (renamed from telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl) | 6 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecom/IInCallService.aidl (renamed from telecomm/java/com/android/internal/telecomm/IInCallService.aidl) | 10 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecom/ITelecomService.aidl (renamed from telecomm/java/com/android/internal/telecomm/ITelecommService.aidl) | 64 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecom/IVideoCallback.aidl (renamed from telecomm/java/com/android/internal/telecomm/IVideoCallback.aidl) | 8 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecom/IVideoProvider.aidl (renamed from telecomm/java/com/android/internal/telecomm/IVideoProvider.aidl) | 6 | ||||
| -rw-r--r-- | telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl (renamed from telecomm/java/com/android/internal/telecomm/RemoteServiceCallback.aidl) | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/DisconnectCause.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 11 | ||||
| -rw-r--r-- | telephony/java/com/android/ims/ImsCallProfile.java | 2 | ||||
| -rw-r--r-- | telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl | 8 | ||||
| -rw-r--r-- | telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl | 6 |
68 files changed, 481 insertions, 495 deletions
@@ -347,14 +347,14 @@ LOCAL_SRC_FILES += \ media/java/android/media/tv/ITvInputSessionCallback.aidl \ media/java/android/service/media/IMediaBrowserService.aidl \ media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl \ - telecomm/java/com/android/internal/telecomm/IVideoCallback.aidl \ - telecomm/java/com/android/internal/telecomm/IVideoProvider.aidl \ - telecomm/java/com/android/internal/telecomm/IConnectionService.aidl \ - telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl \ - telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl \ - telecomm/java/com/android/internal/telecomm/IInCallService.aidl \ - telecomm/java/com/android/internal/telecomm/ITelecommService.aidl \ - telecomm/java/com/android/internal/telecomm/RemoteServiceCallback.aidl \ + telecomm/java/com/android/internal/telecom/IVideoCallback.aidl \ + telecomm/java/com/android/internal/telecom/IVideoProvider.aidl \ + telecomm/java/com/android/internal/telecom/IConnectionService.aidl \ + telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl \ + telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl \ + telecomm/java/com/android/internal/telecom/IInCallService.aidl \ + telecomm/java/com/android/internal/telecom/ITelecomService.aidl \ + telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl \ telephony/java/com/android/ims/internal/IImsCallSession.aidl \ telephony/java/com/android/ims/internal/IImsCallSessionListener.aidl \ telephony/java/com/android/ims/internal/IImsConfig.aidl \ diff --git a/CleanSpec.mk b/CleanSpec.mk index 547ec6c..28c2172 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -209,7 +209,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/ims-common_intermediates) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework2_intermediates) -$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/telecomm/java/com/android/internal/telecomm) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/telecomm/java/com/android/internal/telecom) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/framework.* $(PRODUCT_OUT)/system/framework2.*) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates) @@ -223,6 +223,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/servic $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/services_intermediates) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/inputflinger $(PRODUCT_OUT)/symbols/system/bin/inputflinger) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/RsFountainFbo_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/telecomm/java/com/android/internal/telecomm) # ****************************************************************** # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST ABOVE THIS BANNER diff --git a/api/current.txt b/api/current.txt index 69f55fb..1578dfd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -7386,7 +7386,7 @@ package android.content { field public static final java.lang.String SEARCH_SERVICE = "search"; field public static final java.lang.String SENSOR_SERVICE = "sensor"; field public static final java.lang.String STORAGE_SERVICE = "storage"; - field public static final java.lang.String TELECOMM_SERVICE = "telecomm"; + field public static final java.lang.String TELECOM_SERVICE = "telecom"; field public static final java.lang.String TELEPHONY_SERVICE = "phone"; field public static final java.lang.String TEXT_SERVICES_MANAGER_SERVICE = "textservices"; field public static final java.lang.String TV_INPUT_SERVICE = "tv_input"; @@ -28197,11 +28197,11 @@ package android.system { } -package android.telecomm { +package android.telecom { public final class AudioState implements android.os.Parcelable { ctor public AudioState(boolean, int, int); - ctor public AudioState(android.telecomm.AudioState); + ctor public AudioState(android.telecom.AudioState); method public int describeContents(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; @@ -28216,20 +28216,20 @@ package android.telecomm { } public abstract class Conference { - ctor public Conference(android.telecomm.PhoneAccountHandle); - method public final boolean addConnection(android.telecomm.Connection); + ctor public Conference(android.telecom.PhoneAccountHandle); + method public final boolean addConnection(android.telecom.Connection); method public final void destroy(); method public final int getCapabilities(); - method public final java.util.List<android.telecomm.Connection> getConnections(); - method public final android.telecomm.PhoneAccountHandle getPhoneAccountHandle(); + method public final java.util.List<android.telecom.Connection> getConnections(); + method public final android.telecom.PhoneAccountHandle getPhoneAccountHandle(); method public final int getState(); method public void onDisconnect(); method public void onHold(); method public void onMerge(); - method public void onSeparate(android.telecomm.Connection); + method public void onSeparate(android.telecom.Connection); method public void onSwap(); method public void onUnhold(); - method public final void removeConnection(android.telecomm.Connection); + method public final void removeConnection(android.telecom.Connection); method public final void setActive(); method public final void setCapabilities(int); method public final void setDisconnected(int, java.lang.String); @@ -28238,27 +28238,27 @@ package android.telecomm { public abstract class Connection { ctor public Connection(); - method public static android.telecomm.Connection createCanceledConnection(); - method public static android.telecomm.Connection createFailedConnection(int, java.lang.String); + method public static android.telecom.Connection createCanceledConnection(); + method public static android.telecom.Connection createFailedConnection(int, java.lang.String); method public final void destroy(); method public final android.net.Uri getAddress(); method public final int getAddressPresentation(); method public final boolean getAudioModeIsVoip(); - method public final android.telecomm.AudioState getAudioState(); + method public final android.telecom.AudioState getAudioState(); method public final int getCallCapabilities(); method public final java.lang.String getCallerDisplayName(); method public final int getCallerDisplayNamePresentation(); - method public final android.telecomm.Conference getConference(); - method public final java.util.List<android.telecomm.Connection> getConferenceableConnections(); + method public final android.telecom.Conference getConference(); + method public final java.util.List<android.telecom.Connection> getConferenceableConnections(); method public final int getDisconnectCause(); method public final java.lang.String getDisconnectMessage(); method public final int getState(); - method public final android.telecomm.StatusHints getStatusHints(); + method public final android.telecom.StatusHints getStatusHints(); method public final boolean isRingbackRequested(); method public void onAbort(); method public void onAnswer(); - method public void onAudioStateChanged(android.telecomm.AudioState); - method public void onConferenceWith(android.telecomm.Connection); + method public void onAudioStateChanged(android.telecom.AudioState); + method public void onConferenceWith(android.telecom.Connection); method public void onDisconnect(); method public void onHold(); method public void onPlayDtmfTone(char); @@ -28273,8 +28273,8 @@ package android.telecomm { method public final void setAudioModeIsVoip(boolean); method public final void setCallCapabilities(int); method public final void setCallerDisplayName(java.lang.String, int); - method public final void setConferenceableConnections(java.util.List<android.telecomm.Connection>); - method public final void setConnectionService(android.telecomm.ConnectionService); + method public final void setConferenceableConnections(java.util.List<android.telecom.Connection>); + method public final void setConnectionService(android.telecom.ConnectionService); method public final void setDialing(); method public final void setDisconnected(int, java.lang.String); method public final void setInitialized(); @@ -28283,7 +28283,7 @@ package android.telecomm { method public final void setPostDialWait(java.lang.String); method public final void setRingbackRequested(boolean); method public final void setRinging(); - method public final void setStatusHints(android.telecomm.StatusHints); + method public final void setStatusHints(android.telecom.StatusHints); method public static java.lang.String stateToString(int); field public static final int STATE_ACTIVE = 4; // 0x4 field public static final int STATE_DIALING = 3; // 0x3 @@ -28295,9 +28295,9 @@ package android.telecomm { } public final class ConnectionRequest implements android.os.Parcelable { - ctor public ConnectionRequest(android.telecomm.PhoneAccountHandle, android.net.Uri, android.os.Bundle); + ctor public ConnectionRequest(android.telecom.PhoneAccountHandle, android.net.Uri, android.os.Bundle); method public int describeContents(); - method public android.telecomm.PhoneAccountHandle getAccountHandle(); + method public android.telecom.PhoneAccountHandle getAccountHandle(); method public android.net.Uri getAddress(); method public android.os.Bundle getExtras(); method public void writeToParcel(android.os.Parcel, int); @@ -28306,17 +28306,17 @@ package android.telecomm { public abstract class ConnectionService extends android.app.Service { ctor public ConnectionService(); - method public final void addConference(android.telecomm.Conference); - method public final void conferenceRemoteConnections(android.telecomm.RemoteConnection, android.telecomm.RemoteConnection); - method public final android.telecomm.RemoteConnection createRemoteIncomingConnection(android.telecomm.PhoneAccountHandle, android.telecomm.ConnectionRequest); - method public final android.telecomm.RemoteConnection createRemoteOutgoingConnection(android.telecomm.PhoneAccountHandle, android.telecomm.ConnectionRequest); - method public final java.util.Collection<android.telecomm.Connection> getAllConnections(); + method public final void addConference(android.telecom.Conference); + method public final void conferenceRemoteConnections(android.telecom.RemoteConnection, android.telecom.RemoteConnection); + method public final android.telecom.RemoteConnection createRemoteIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); + method public final android.telecom.RemoteConnection createRemoteOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); + method public final java.util.Collection<android.telecom.Connection> getAllConnections(); method public final android.os.IBinder onBind(android.content.Intent); - method public void onConference(android.telecomm.Connection, android.telecomm.Connection); - method public android.telecomm.Connection onCreateIncomingConnection(android.telecomm.PhoneAccountHandle, android.telecomm.ConnectionRequest); - method public android.telecomm.Connection onCreateOutgoingConnection(android.telecomm.PhoneAccountHandle, android.telecomm.ConnectionRequest); - method public void onRemoteConferenceAdded(android.telecomm.RemoteConference); - field public static final java.lang.String SERVICE_INTERFACE = "android.telecomm.ConnectionService"; + method public void onConference(android.telecom.Connection, android.telecom.Connection); + method public android.telecom.Connection onCreateIncomingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); + method public android.telecom.Connection onCreateOutgoingConnection(android.telecom.PhoneAccountHandle, android.telecom.ConnectionRequest); + method public void onRemoteConferenceAdded(android.telecom.RemoteConference); + field public static final java.lang.String SERVICE_INTERFACE = "android.telecom.ConnectionService"; } public class GatewayInfo implements android.os.Parcelable { @@ -28330,9 +28330,9 @@ package android.telecomm { } public class PhoneAccount implements android.os.Parcelable { - method public static android.telecomm.PhoneAccount.Builder builder(android.telecomm.PhoneAccountHandle, java.lang.CharSequence); + method public static android.telecom.PhoneAccount.Builder builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence); method public int describeContents(); - method public android.telecomm.PhoneAccountHandle getAccountHandle(); + method public android.telecom.PhoneAccountHandle getAccountHandle(); method public android.net.Uri getAddress(); method public int getCapabilities(); method public android.graphics.drawable.Drawable getIcon(android.content.Context); @@ -28355,15 +28355,15 @@ package android.telecomm { } public static class PhoneAccount.Builder { - ctor public PhoneAccount.Builder(android.telecomm.PhoneAccountHandle, java.lang.CharSequence); - ctor public PhoneAccount.Builder(android.telecomm.PhoneAccount); - method public android.telecomm.PhoneAccount build(); - method public android.telecomm.PhoneAccount.Builder setAddress(android.net.Uri); - method public android.telecomm.PhoneAccount.Builder setCapabilities(int); - method public android.telecomm.PhoneAccount.Builder setIconResId(int); - method public android.telecomm.PhoneAccount.Builder setShortDescription(java.lang.CharSequence); - method public android.telecomm.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri); - method public android.telecomm.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>); + ctor public PhoneAccount.Builder(android.telecom.PhoneAccountHandle, java.lang.CharSequence); + ctor public PhoneAccount.Builder(android.telecom.PhoneAccount); + method public android.telecom.PhoneAccount build(); + method public android.telecom.PhoneAccount.Builder setAddress(android.net.Uri); + method public android.telecom.PhoneAccount.Builder setCapabilities(int); + method public android.telecom.PhoneAccount.Builder setIconResId(int); + method public android.telecom.PhoneAccount.Builder setShortDescription(java.lang.CharSequence); + method public android.telecom.PhoneAccount.Builder setSubscriptionAddress(android.net.Uri); + method public android.telecom.PhoneAccount.Builder setSupportedUriSchemes(java.util.List<java.lang.String>); } public class PhoneAccountHandle implements android.os.Parcelable { @@ -28393,25 +28393,25 @@ package android.telecomm { public final class RemoteConference { method public void disconnect(); method public final int getCallCapabilities(); - method public final java.util.List<android.telecomm.RemoteConnection> getConnections(); + method public final java.util.List<android.telecom.RemoteConnection> getConnections(); method public int getDisconnectCause(); method public java.lang.String getDisconnectMessage(); method public final int getState(); method public void hold(); - method public final void registerCallback(android.telecomm.RemoteConference.Callback); - method public void separate(android.telecomm.RemoteConnection); + method public final void registerCallback(android.telecom.RemoteConference.Callback); + method public void separate(android.telecom.RemoteConnection); method public void unhold(); - method public final void unregisterCallback(android.telecomm.RemoteConference.Callback); + method public final void unregisterCallback(android.telecom.RemoteConference.Callback); } public static abstract class RemoteConference.Callback { ctor public RemoteConference.Callback(); - method public void onCapabilitiesChanged(android.telecomm.RemoteConference, int); - method public void onConnectionAdded(android.telecomm.RemoteConference, android.telecomm.RemoteConnection); - method public void onConnectionRemoved(android.telecomm.RemoteConference, android.telecomm.RemoteConnection); - method public void onDestroyed(android.telecomm.RemoteConference); - method public void onDisconnected(android.telecomm.RemoteConference, int, java.lang.String); - method public void onStateChanged(android.telecomm.RemoteConference, int, int); + method public void onCapabilitiesChanged(android.telecom.RemoteConference, int); + method public void onConnectionAdded(android.telecom.RemoteConference, android.telecom.RemoteConnection); + method public void onConnectionRemoved(android.telecom.RemoteConference, android.telecom.RemoteConnection); + method public void onDestroyed(android.telecom.RemoteConference); + method public void onDisconnected(android.telecom.RemoteConference, int, java.lang.String); + method public void onStateChanged(android.telecom.RemoteConference, int, int); } public final class RemoteConnection { @@ -28423,41 +28423,41 @@ package android.telecomm { method public int getCallCapabilities(); method public java.lang.CharSequence getCallerDisplayName(); method public int getCallerDisplayNamePresentation(); - method public android.telecomm.RemoteConference getConference(); - method public java.util.List<android.telecomm.RemoteConnection> getConferenceableConnections(); + method public android.telecom.RemoteConference getConference(); + method public java.util.List<android.telecom.RemoteConnection> getConferenceableConnections(); method public int getDisconnectCauseCode(); method public java.lang.String getDisconnectCauseMessage(); method public int getFailureCode(); method public java.lang.String getFailureMessage(); method public int getState(); - method public android.telecomm.StatusHints getStatusHints(); + method public android.telecom.StatusHints getStatusHints(); method public void hold(); method public boolean isRingbackRequested(); method public boolean isVoipAudioMode(); method public void playDtmfTone(char); method public void postDialContinue(boolean); - method public void registerCallback(android.telecomm.RemoteConnection.Callback); + method public void registerCallback(android.telecom.RemoteConnection.Callback); method public void reject(); - method public void setAudioState(android.telecomm.AudioState); + method public void setAudioState(android.telecom.AudioState); method public void stopDtmfTone(); method public void unhold(); - method public void unregisterCallback(android.telecomm.RemoteConnection.Callback); + method public void unregisterCallback(android.telecom.RemoteConnection.Callback); } public static abstract class RemoteConnection.Callback { ctor public RemoteConnection.Callback(); - method public void onAddressChanged(android.telecomm.RemoteConnection, android.net.Uri, int); - method public void onCallCapabilitiesChanged(android.telecomm.RemoteConnection, int); - method public void onCallerDisplayNameChanged(android.telecomm.RemoteConnection, java.lang.String, int); - method public void onConferenceChanged(android.telecomm.RemoteConnection, android.telecomm.RemoteConference); - method public void onConferenceableConnectionsChanged(android.telecomm.RemoteConnection, java.util.List<android.telecomm.RemoteConnection>); - method public void onDestroyed(android.telecomm.RemoteConnection); - method public void onDisconnected(android.telecomm.RemoteConnection, int, java.lang.String); - method public void onPostDialWait(android.telecomm.RemoteConnection, java.lang.String); - method public void onRingbackRequested(android.telecomm.RemoteConnection, boolean); - method public void onStateChanged(android.telecomm.RemoteConnection, int); - method public void onStatusHintsChanged(android.telecomm.RemoteConnection, android.telecomm.StatusHints); - method public void onVoipAudioChanged(android.telecomm.RemoteConnection, boolean); + method public void onAddressChanged(android.telecom.RemoteConnection, android.net.Uri, int); + method public void onCallCapabilitiesChanged(android.telecom.RemoteConnection, int); + method public void onCallerDisplayNameChanged(android.telecom.RemoteConnection, java.lang.String, int); + method public void onConferenceChanged(android.telecom.RemoteConnection, android.telecom.RemoteConference); + method public void onConferenceableConnectionsChanged(android.telecom.RemoteConnection, java.util.List<android.telecom.RemoteConnection>); + method public void onDestroyed(android.telecom.RemoteConnection); + method public void onDisconnected(android.telecom.RemoteConnection, int, java.lang.String); + method public void onPostDialWait(android.telecom.RemoteConnection, java.lang.String); + method public void onRingbackRequested(android.telecom.RemoteConnection, boolean); + method public void onStateChanged(android.telecom.RemoteConnection, int); + method public void onStatusHintsChanged(android.telecom.RemoteConnection, android.telecom.StatusHints); + method public void onVoipAudioChanged(android.telecom.RemoteConnection, boolean); } public final class StatusHints implements android.os.Parcelable { @@ -28472,36 +28472,36 @@ package android.telecomm { field public static final android.os.Parcelable.Creator CREATOR; } - public class TelecommManager { - method public void addNewIncomingCall(android.telecomm.PhoneAccountHandle, android.os.Bundle); + public class TelecomManager { + method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle); method public void cancelMissedCallsNotification(); method public void clearAccounts(); - method public android.telecomm.PhoneAccountHandle getConnectionManager(); - method public android.telecomm.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String); - method public java.util.List<android.telecomm.PhoneAccountHandle> getEnabledPhoneAccounts(); - method public android.telecomm.PhoneAccount getPhoneAccount(android.telecomm.PhoneAccountHandle); - method public java.util.List<android.telecomm.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String); + method public android.telecom.PhoneAccountHandle getConnectionManager(); + method public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(java.lang.String); + method public java.util.List<android.telecom.PhoneAccountHandle> getEnabledPhoneAccounts(); + method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle); + method public java.util.List<android.telecom.PhoneAccountHandle> getPhoneAccountsSupportingScheme(java.lang.String); method public boolean handleMmi(java.lang.String); method public boolean hasMultipleEnabledAccounts(); method public boolean isInCall(); - method public void registerPhoneAccount(android.telecomm.PhoneAccount); + method public void registerPhoneAccount(android.telecom.PhoneAccount); method public void showInCallScreen(boolean); - method public void unregisterPhoneAccount(android.telecomm.PhoneAccountHandle); - field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecomm.action.CHANGE_PHONE_ACCOUNTS"; - field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecomm.action.CONNECTION_SERVICE_CONFIGURE"; + method public void unregisterPhoneAccount(android.telecom.PhoneAccountHandle); + field public static final java.lang.String ACTION_CHANGE_PHONE_ACCOUNTS = "android.telecom.action.CHANGE_PHONE_ACCOUNTS"; + field public static final java.lang.String ACTION_CONNECTION_SERVICE_CONFIGURE = "android.telecom.action.CONNECTION_SERVICE_CONFIGURE"; field public static final java.lang.String ACTION_PHONE_ACCOUNT_DISABLED = "android.telecom.action.PHONE_ACCOUNT_DISABLED"; field public static final java.lang.String ACTION_PHONE_ACCOUNT_ENABLED = "android.telecom.action.PHONE_ACCOUNT_ENABLED"; - field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecomm.action.SHOW_CALL_SETTINGS"; + field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS"; field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ',' field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';' - field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecomm.extra.CALL_BACK_NUMBER"; - field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecomm.extra.CALL_DISCONNECT_CAUSE"; - field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecomm.extra.CALL_DISCONNECT_MESSAGE"; - field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecomm.extra.CONNECTION_SERVICE"; - field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecomm.extra.PHONE_ACCOUNT_HANDLE"; - field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecomm.extra.START_CALL_WITH_SPEAKERPHONE"; - field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecomm.extra.GATEWAY_ORIGINAL_ADDRESS"; - field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecomm.extra.GATEWAY_PROVIDER_PACKAGE"; + field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER"; + field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE"; + field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE"; + field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE"; + field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE"; + field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE"; + field public static final java.lang.String GATEWAY_ORIGINAL_ADDRESS = "android.telecom.extra.GATEWAY_ORIGINAL_ADDRESS"; + field public static final java.lang.String GATEWAY_PROVIDER_PACKAGE = "android.telecom.extra.GATEWAY_PROVIDER_PACKAGE"; field public static final int PRESENTATION_ALLOWED = 1; // 0x1 field public static final int PRESENTATION_PAYPHONE = 4; // 0x4 field public static final int PRESENTATION_RESTRICTED = 2; // 0x2 diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 64eafb0..e9340eb 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -124,7 +124,7 @@ import android.print.IPrintManager; import android.print.PrintManager; import android.service.fingerprint.IFingerprintService; import android.service.fingerprint.FingerprintManager; -import android.telecomm.TelecommManager; +import android.telecom.TelecomManager; import android.telephony.TelephonyManager; import android.content.ClipboardManager; import android.util.AndroidRuntimeException; @@ -148,7 +148,7 @@ import android.app.trust.TrustManager; import com.android.internal.annotations.GuardedBy; import com.android.internal.app.IAppOpsService; import com.android.internal.os.IDropBoxManagerService; -import com.android.internal.telecomm.ITelecommService; +import com.android.internal.telecom.ITelecomService; import java.io.File; import java.io.FileInputStream; @@ -562,9 +562,9 @@ class ContextImpl extends Context { return new TelephonyManager(ctx.getOuterContext()); }}); - registerService(TELECOMM_SERVICE, new ServiceFetcher() { + registerService(TELECOM_SERVICE, new ServiceFetcher() { public Object createService(ContextImpl ctx) { - return new TelecommManager(ctx.getOuterContext()); + return new TelecomManager(ctx.getOuterContext()); }}); registerService(UI_MODE_SERVICE, new ServiceFetcher() { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 4f20705..158a40c 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2115,7 +2115,7 @@ public abstract class Context { AUDIO_SERVICE, MEDIA_ROUTER_SERVICE, TELEPHONY_SERVICE, - TELECOMM_SERVICE, + TELECOM_SERVICE, CLIPBOARD_SERVICE, INPUT_METHOD_SERVICE, TEXT_SERVICES_MANAGER_SERVICE, @@ -2588,13 +2588,13 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve a - * {@link android.telecomm.TelecommManager} to manage telecomm-related features + * {@link android.telecom.TelecomManager} to manage telecom-related features * of the device. * * @see #getSystemService - * @see android.telecomm.TelecommManager + * @see android.telecom.TelecomManager */ - public static final String TELECOMM_SERVICE = "telecomm"; + public static final String TELECOM_SERVICE = "telecom"; /** * Use with {@link #getSystemService} to retrieve a diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java index a5e86d8..c8d0fd5 100644 --- a/core/java/android/provider/CallLog.java +++ b/core/java/android/provider/CallLog.java @@ -33,7 +33,7 @@ import android.provider.ContactsContract.CommonDataKinds.Callable; import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.Data; import android.provider.ContactsContract.DataUsageFeedback; -import android.telecomm.PhoneAccountHandle; +import android.telecom.PhoneAccountHandle; import android.telephony.PhoneNumberUtils; import android.text.TextUtils; diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java index c84708e..f25cf9b 100644 --- a/core/java/com/android/internal/widget/LockPatternUtils.java +++ b/core/java/com/android/internal/widget/LockPatternUtils.java @@ -35,7 +35,7 @@ import android.os.UserHandle; import android.os.storage.IMountService; import android.os.storage.StorageManager; import android.provider.Settings; -import android.telecomm.TelecommManager; +import android.telecom.TelecomManager; import android.text.TextUtils; import android.util.Log; import android.view.IWindowManager; @@ -1477,8 +1477,8 @@ public class LockPatternUtils { return getTelecommManager().isInCall(); } - private TelecommManager getTelecommManager() { - return (TelecommManager) mContext.getSystemService(Context.TELECOMM_SERVICE); + private TelecomManager getTelecommManager() { + return (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE); } private void finishBiometricWeak() { diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 6c9fb9a..86c4d02 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -25,7 +25,6 @@ import android.app.ActivityManager; import android.app.ActivityManagerNative; import android.app.AppOpsManager; import android.app.KeyguardManager; -import android.app.PendingIntent; import android.bluetooth.BluetoothA2dp; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothClass; @@ -68,7 +67,7 @@ import android.os.UserHandle; import android.os.Vibrator; import android.provider.Settings; import android.provider.Settings.System; -import android.telecomm.TelecommManager; +import android.telecom.TelecomManager; import android.text.TextUtils; import android.util.Log; import android.util.MathUtils; @@ -2939,9 +2938,9 @@ public class AudioService extends IAudioService.Stub { private boolean isInCommunication() { boolean IsInCall = false; - TelecommManager telecommManager = - (TelecommManager) mContext.getSystemService(Context.TELECOMM_SERVICE); - IsInCall = telecommManager.isInCall(); + TelecomManager telecomManager = + (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE); + IsInCall = telecomManager.isInCall(); return (IsInCall || getMode() == AudioManager.MODE_IN_COMMUNICATION); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 20eed3f..e323dd6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -30,7 +30,7 @@ import android.os.Bundle; import android.os.RemoteException; import android.os.UserHandle; import android.provider.MediaStore; -import android.telecomm.TelecommManager; +import android.telecom.TelecomManager; import android.util.AttributeSet; import android.util.Log; import android.util.TypedValue; @@ -331,7 +331,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL } public void launchPhone() { - final TelecommManager tm = TelecommManager.from(mContext); + final TelecomManager tm = TelecomManager.from(mContext); if (tm.isInCall()) { AsyncTask.execute(new Runnable() { @Override diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index 237b782..6006217 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -27,7 +27,7 @@ import android.media.AudioManager; import android.os.Handler; import android.os.UserHandle; import android.provider.Settings.Global; -import android.telecomm.TelecommManager; +import android.telecom.TelecomManager; import android.util.Log; import com.android.internal.telephony.IccCardConstants; @@ -93,7 +93,7 @@ public class PhoneStatusBarPolicy { else if (action.equals(TelephonyIntents.ACTION_SIM_STATE_CHANGED)) { updateSimState(intent); } - else if (action.equals(TelecommManager.ACTION_CURRENT_TTY_MODE_CHANGED)) { + else if (action.equals(TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED)) { updateTTY(intent); } else if (action.equals(Intent.ACTION_USER_SWITCHED)) { @@ -115,7 +115,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(TelecommManager.ACTION_CURRENT_TTY_MODE_CHANGED); + filter.addAction(TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED); filter.addAction(Intent.ACTION_USER_SWITCHED); mContext.registerReceiver(mIntentReceiver, filter, null, mHandler); @@ -279,9 +279,9 @@ public class PhoneStatusBarPolicy { } private final void updateTTY(Intent intent) { - int currentTtyMode = intent.getIntExtra(TelecommManager.EXTRA_CURRENT_TTY_MODE, - TelecommManager.TTY_MODE_OFF); - boolean enabled = currentTtyMode != TelecommManager.TTY_MODE_OFF; + int currentTtyMode = intent.getIntExtra(TelecomManager.EXTRA_CURRENT_TTY_MODE, + TelecomManager.TTY_MODE_OFF); + boolean enabled = currentTtyMode != TelecomManager.TTY_MODE_OFF; if (DEBUG) Log.v(TAG, "updateTTY: enabled: " + enabled); diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 4713a98..24e5a7d 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -72,7 +72,7 @@ import android.service.dreams.DreamManagerInternal; import android.service.dreams.DreamService; import android.service.dreams.IDreamManager; import android.speech.RecognizerIntent; -import android.telecomm.TelecommManager; +import android.telecom.TelecomManager; import android.util.DisplayMetrics; import android.util.EventLog; import android.util.Log; @@ -2131,8 +2131,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { ServiceManager.checkService(DreamService.DREAM_SERVICE)); } - TelecommManager getTelecommService() { - return (TelecommManager) mContext.getSystemService(Context.TELECOMM_SERVICE); + TelecomManager getTelecommService() { + return (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE); } static IAudioService getAudioService() { @@ -2221,8 +2221,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { // If an incoming call is ringing, HOME is totally disabled. // (The user is already on the InCallUI at this point, // and his ONLY options are to answer or reject the call.) - TelecommManager telecommManager = getTelecommService(); - if (telecommManager != null && telecommManager.isRinging()) { + TelecomManager telecomManager = getTelecommService(); + if (telecomManager != null && telecomManager.isRinging()) { Log.i(TAG, "Ignoring HOME; there's a ringing incoming call."); return -1; } @@ -4322,9 +4322,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } if (down) { - TelecommManager telecommManager = getTelecommService(); - if (telecommManager != null) { - if (telecommManager.isRinging()) { + TelecomManager telecomManager = getTelecommService(); + if (telecomManager != null) { + if (telecomManager.isRinging()) { // If an incoming call is ringing, either VOLUME key means // "silence ringer". We handle these keys here, rather than // in the InCallScreen, to make sure we'll respond to them @@ -4336,14 +4336,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { // Silence the ringer. (It's safe to call this // even if the ringer has already been silenced.) - telecommManager.silenceRinger(); + telecomManager.silenceRinger(); // And *don't* pass this key thru to the current activity // (which is probably the InCallScreen.) result &= ~ACTION_PASS_TO_USER; break; } - if (telecommManager.isInCall() + if (telecomManager.isInCall() && (result & ACTION_PASS_TO_USER) == 0) { // If we are in call but we decided not to pass the key to // the application, just pass it to the session service. @@ -4369,10 +4369,10 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyEvent.KEYCODE_ENDCALL: { result &= ~ACTION_PASS_TO_USER; if (down) { - TelecommManager telecommManager = getTelecommService(); + TelecomManager telecomManager = getTelecommService(); boolean hungUp = false; - if (telecommManager != null) { - hungUp = telecommManager.endCall(); + if (telecomManager != null) { + hungUp = telecomManager.endCall(); } interceptPowerKeyDown(!interactive || hungUp); } else { @@ -4409,19 +4409,19 @@ public class PhoneWindowManager implements WindowManagerPolicy { interceptScreenshotChord(); } - TelecommManager telecommManager = getTelecommService(); + TelecomManager telecomManager = getTelecommService(); boolean hungUp = false; - if (telecommManager != null) { - if (telecommManager.isRinging()) { + if (telecomManager != null) { + if (telecomManager.isRinging()) { // Pressing Power while there's a ringing incoming // call should silence the ringer. - telecommManager.silenceRinger(); + telecomManager.silenceRinger(); } else if ((mIncallPowerBehavior & Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_HANGUP) != 0 - && telecommManager.isInCall() && interactive) { + && telecomManager.isInCall() && interactive) { // Otherwise, if "Power button ends call" is enabled, // the Power button will hang up any current active call. - hungUp = telecommManager.endCall(); + hungUp = telecomManager.endCall(); } } interceptPowerKeyDown(!interactive || hungUp @@ -4459,9 +4459,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyEvent.KEYCODE_MEDIA_PAUSE: case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE: if (down) { - TelecommManager telecommManager = getTelecommService(); - if (telecommManager != null) { - if (telecommManager.isInCall()) { + TelecomManager telecomManager = getTelecommService(); + if (telecomManager != null) { + if (telecomManager.isInCall()) { // Suppress PLAY/PAUSE toggle when phone is ringing or in-call // to avoid music playback. break; @@ -4494,12 +4494,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { case KeyEvent.KEYCODE_CALL: { if (down) { - TelecommManager telecommManager = getTelecommService(); - if (telecommManager != null) { - if (telecommManager.isRinging()) { + TelecomManager telecomManager = getTelecommService(); + if (telecomManager != null) { + if (telecomManager.isRinging()) { Log.i(TAG, "interceptKeyBeforeQueueing:" + " CALL key-down while ringing: Answer the call!"); - telecommManager.acceptRingingCall(); + telecomManager.acceptRingingCall(); // And *don't* pass this key thru to the current activity // (which is presumably the InCallScreen.) diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 41d7fa8..479af89 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -40,7 +40,7 @@ import android.provider.Settings.Global; import android.provider.Settings.Secure; import android.service.notification.NotificationListenerService; import android.service.notification.ZenModeConfig; -import android.telecomm.TelecommManager; +import android.telecom.TelecomManager; import android.util.Log; import android.util.Slog; @@ -346,8 +346,8 @@ public class ZenModeHelper { private boolean isDefaultPhoneApp(String pkg) { if (mDefaultPhoneApp == null) { - final TelecommManager telecomm = - (TelecommManager) mContext.getSystemService(Context.TELECOMM_SERVICE); + final TelecomManager telecomm = + (TelecomManager) mContext.getSystemService(Context.TELECOM_SERVICE); mDefaultPhoneApp = telecomm != null ? telecomm.getDefaultPhoneApp() : null; if (DEBUG) Slog.d(TAG, "Default phone app: " + mDefaultPhoneApp); } diff --git a/telecomm/java/android/telecomm/AudioState.aidl b/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 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 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 @@ public final class Call { /** * @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 @@ public final class Call { /** * @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 @@ public final class Call { } /** - * @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 @@ public final class Call { } 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 @@ public final class Call { * @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 @@ public final class Call { * @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 @@ public final class Call { * 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 @@ public final class Call { * currently playing, this method will do nothing. */ public void stopDtmfTone() { - mInCallAdapter.stopDtmfTone(mTelecommCallId); + mInCallAdapter.stopDtmfTone(mTelecomCallId); } /** @@ -465,10 +464,10 @@ public final class Call { * 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 @@ public final class Call { * @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 @@ public final class Call { * an outgoing call. */ public void phoneAccountSelected(PhoneAccountHandle accountHandle) { - mInCallAdapter.phoneAccountSelected(mTelecommCallId, accountHandle); + mInCallAdapter.phoneAccountSelected(mTelecomCallId, accountHandle); } @@ -497,7 +496,7 @@ public final class Call { */ public void conference(Call callToConferenceWith) { if (callToConferenceWith != null) { - mInCallAdapter.conference(mTelecommCallId, callToConferenceWith.mTelecommCallId); + mInCallAdapter.conference(mTelecomCallId, callToConferenceWith.mTelecomCallId); } } @@ -506,21 +505,21 @@ public final class Call { * 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 final class Call { */ public Call getParent() { if (mParentId != null) { - return mPhone.internalGetCallByTelecommId(mParentId); + return mPhone.internalGetCallByTelecomId(mParentId); } return null; } @@ -548,7 +547,7 @@ public final class Call { 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 @@ public final class Call { } /** {@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 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 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 @@ public final class CallState { /** * 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 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 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 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 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 @@ public abstract class Connection { /** * @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 @@ public abstract class Connection { /** * @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 @@ public abstract class Connection { * * @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 @@ public abstract class Connection { * * @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 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 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 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.os.Message; 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 @@ public abstract class ConnectionService extends Service { * 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 @@ public abstract class ConnectionService extends Service { 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 @@ public abstract class ConnectionService extends Service { } /** - * 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 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 @@ final class ConnectionServiceAdapter implements DeathRecipient { } /** - * 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 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 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 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 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * 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 @@ public final class InCallAdapter { } /** - * Instructs Telecomm to turn the proximity sensor on. + * Instructs Telecom to turn the proximity sensor on. */ public void turnProximitySensorOn() { try { @@ -259,7 +259,7 @@ public final class InCallAdapter { } /** - * 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 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.os.Message; 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 @@ public abstract class InCallService extends Service { * 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 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 @@ import java.util.Locale; */ 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 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 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.ArrayList; 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 @@ public final class ParcelableCall implements Parcelable { } /** - * 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 @@ public final class ParcelableCall implements Parcelable { /** * 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 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 index b279861..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 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 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 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 final class Phone { 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 @@ public final class Phone { /** {@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 @@ public final class Phone { } /** {@hide} */ - final Call internalGetCallByTelecommId(String telecommId) { - return mCallByTelecommCallId.get(telecommId); + final Call internalGetCallByTelecomId(String telecomId) { + return mCallByTelecomCallId.get(telecomId); } /** {@hide} */ @@ -269,13 +268,13 @@ public final class Phone { 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 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 index b37c144..0c233eb 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 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 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 @@ public class PhoneAccountHandle implements Parcelable { } /** - * 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 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 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 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 @@ public final class RemoteConnection { * @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 @@ public final class RemoteConnection { * @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 @@ public final class RemoteConnection { } /** - * @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 @@ public final class RemoteConnection { /** * @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 @@ public final class RemoteConnection { * 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 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 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 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 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 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 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.RemoteException; 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 @@ public class TelecommManager { /** * 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 @@ public class TelecommManager { * 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 @@ public class TelecommManager { * @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 @@ public class TelecommManager { * 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 @@ public class TelecommManager { * @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 @@ public class TelecommManager { * @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 @@ public class TelecommManager { * 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 @@ public class TelecommManager { * (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 @@ public class TelecommManager { * 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 @@ public class TelecommManager { * @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 @@ public class TelecommManager { * @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 @@ public class TelecommManager { * @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 @@ public class TelecommManager { * @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 @@ public class TelecommManager { /** 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 @@ public class TelecommManager { * 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 @@ public class TelecommManager { /** * 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 class TelecommManager { 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 @@ public class TelecommManager { * 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 class TelecommManager { 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 @@ public class TelecommManager { * @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 @@ public class TelecommManager { * </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 @@ public class TelecommManager { * @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 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 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 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 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; diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl index 3af4ed3..1059da3 100644 --- a/telecomm/java/com/android/internal/telecomm/IConnectionService.aidl +++ b/telecomm/java/com/android/internal/telecom/IConnectionService.aidl @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.android.internal.telecomm; +package com.android.internal.telecom; import android.os.Bundle; -import android.telecomm.AudioState; -import android.telecomm.ConnectionRequest; -import android.telecomm.PhoneAccountHandle; +import android.telecom.AudioState; +import android.telecom.ConnectionRequest; +import android.telecom.PhoneAccountHandle; -import com.android.internal.telecomm.IConnectionServiceAdapter; +import com.android.internal.telecom.IConnectionServiceAdapter; /** * Internal remote interface for connection services. * - * @see android.telecomm.ConnectionService + * @see android.telecom.ConnectionService * * @hide */ diff --git a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl index 4b636d1..8f3506d 100644 --- a/telecomm/java/com/android/internal/telecomm/IConnectionServiceAdapter.aidl +++ b/telecomm/java/com/android/internal/telecom/IConnectionServiceAdapter.aidl @@ -14,22 +14,22 @@ * limitations under the License. */ -package com.android.internal.telecomm; +package com.android.internal.telecom; import android.app.PendingIntent; import android.net.Uri; -import android.telecomm.ConnectionRequest; -import android.telecomm.ParcelableConnection; -import android.telecomm.ParcelableConference; -import android.telecomm.StatusHints; +import android.telecom.ConnectionRequest; +import android.telecom.ParcelableConnection; +import android.telecom.ParcelableConference; +import android.telecom.StatusHints; -import com.android.internal.telecomm.IVideoProvider; -import com.android.internal.telecomm.RemoteServiceCallback; +import com.android.internal.telecom.IVideoProvider; +import com.android.internal.telecom.RemoteServiceCallback; /** * Internal remote callback interface for connection services. * - * @see android.telecomm.ConnectionServiceAdapter + * @see android.telecom.ConnectionServiceAdapter * * {@hide} */ diff --git a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl b/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl index 808a410..138a877 100644 --- a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl +++ b/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.internal.telecomm; +package com.android.internal.telecom; -import android.telecomm.PhoneAccountHandle; +import android.telecom.PhoneAccountHandle; /** * Internal remote callback interface for in-call services. * - * @see android.telecomm.InCallAdapter + * @see android.telecom.InCallAdapter * * {@hide} */ diff --git a/telecomm/java/com/android/internal/telecomm/IInCallService.aidl b/telecomm/java/com/android/internal/telecom/IInCallService.aidl index 23dbaf4..35f6f65 100644 --- a/telecomm/java/com/android/internal/telecomm/IInCallService.aidl +++ b/telecomm/java/com/android/internal/telecom/IInCallService.aidl @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.android.internal.telecomm; +package com.android.internal.telecom; import android.app.PendingIntent; -import android.telecomm.AudioState; -import android.telecomm.ParcelableCall; +import android.telecom.AudioState; +import android.telecom.ParcelableCall; -import com.android.internal.telecomm.IInCallAdapter; +import com.android.internal.telecom.IInCallAdapter; /** * Internal remote interface for in-call services. * - * @see android.telecomm.InCallService + * @see android.telecom.InCallService * * {@hide} */ diff --git a/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl index 30f2801..4edce53 100644 --- a/telecomm/java/com/android/internal/telecomm/ITelecommService.aidl +++ b/telecomm/java/com/android/internal/telecom/ITelecomService.aidl @@ -14,19 +14,19 @@ * limitations under the License. */ -package com.android.internal.telecomm; +package com.android.internal.telecom; import android.content.ComponentName; -import android.telecomm.PhoneAccountHandle; +import android.telecom.PhoneAccountHandle; import android.os.Bundle; -import android.telecomm.PhoneAccount; +import android.telecom.PhoneAccount; /** - * Interface used to interact with Telecomm. Mostly this is used by TelephonyManager for passing + * Interface used to interact with Telecom. Mostly this is used by TelephonyManager for passing * commands that were previously handled by ITelephony. * {@hide} */ -interface ITelecommService { +interface ITelecomService { /** * Brings the in-call screen to the foreground if there is an active call. * @@ -35,87 +35,87 @@ interface ITelecommService { void showInCallScreen(boolean showDialpad); /** - * @see TelecommServiceImpl#getDefaultOutgoingPhoneAccount + * @see TelecomServiceImpl#getDefaultOutgoingPhoneAccount */ PhoneAccountHandle getDefaultOutgoingPhoneAccount(in String uriScheme); /** - * @see TelecommServiceImpl#getUserSelectedOutgoingPhoneAccount + * @see TelecomServiceImpl#getUserSelectedOutgoingPhoneAccount */ PhoneAccountHandle getUserSelectedOutgoingPhoneAccount(); /** - * @see TelecommServiceImpl#setUserSelectedOutgoingPhoneAccount + * @see TelecomServiceImpl#setUserSelectedOutgoingPhoneAccount */ void setUserSelectedOutgoingPhoneAccount(in PhoneAccountHandle account); /** - * @see TelecommServiceImpl#getEnabledPhoneAccounts + * @see TelecomServiceImpl#getEnabledPhoneAccounts */ List<PhoneAccountHandle> getEnabledPhoneAccounts(); /** - * @see TelecommManager#getPhoneAccountsSupportingScheme + * @see TelecomManager#getPhoneAccountsSupportingScheme */ List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(in String uriScheme); /** - * @see TelecommManager#getPhoneAccount + * @see TelecomManager#getPhoneAccount */ PhoneAccount getPhoneAccount(in PhoneAccountHandle account); /** - * @see TelecommManager#getAllPhoneAccountsCount + * @see TelecomManager#getAllPhoneAccountsCount */ int getAllPhoneAccountsCount(); /** - * @see TelecommManager#getAllPhoneAccounts + * @see TelecomManager#getAllPhoneAccounts */ List<PhoneAccount> getAllPhoneAccounts(); /** - * @see TelecommManager#getAllPhoneAccountHandles + * @see TelecomManager#getAllPhoneAccountHandles */ List<PhoneAccountHandle> getAllPhoneAccountHandles(); /** - * @see TelecommServiceImpl#getSimCallManager + * @see TelecomServiceImpl#getSimCallManager */ PhoneAccountHandle getSimCallManager(); /** - * @see TelecommServiceImpl#setSimCallManager + * @see TelecomServiceImpl#setSimCallManager */ void setSimCallManager(in PhoneAccountHandle account); /** - * @see TelecommServiceImpl#getSimCallManagers + * @see TelecomServiceImpl#getSimCallManagers */ List<PhoneAccountHandle> getSimCallManagers(); /** - * @see TelecommServiceImpl#setPhoneAccountEnabled + * @see TelecomServiceImpl#setPhoneAccountEnabled */ void setPhoneAccountEnabled(in PhoneAccountHandle account, in boolean isEnabled); /** - * @see TelecommServiceImpl#registerPhoneAccount + * @see TelecomServiceImpl#registerPhoneAccount */ void registerPhoneAccount(in PhoneAccount metadata); /** - * @see TelecommServiceImpl#unregisterPhoneAccount + * @see TelecomServiceImpl#unregisterPhoneAccount */ void unregisterPhoneAccount(in PhoneAccountHandle account); /** - * @see TelecommServiceImpl#clearAccounts + * @see TelecomServiceImpl#clearAccounts */ void clearAccounts(String packageName); /** - * @see TelecommServiceImpl#getDefaultPhoneApp + * @see TelecomServiceImpl#getDefaultPhoneApp */ ComponentName getDefaultPhoneApp(); @@ -124,52 +124,52 @@ interface ITelecommService { // /** - * @see TelecommServiceImpl#silenceRinger + * @see TelecomServiceImpl#silenceRinger */ void silenceRinger(); /** - * @see TelecommServiceImpl#isInCall + * @see TelecomServiceImpl#isInCall */ boolean isInCall(); /** - * @see TelecommServiceImpl#isRinging + * @see TelecomServiceImpl#isRinging */ boolean isRinging(); /** - * @see TelecommServiceImpl#endCall + * @see TelecomServiceImpl#endCall */ boolean endCall(); /** - * @see TelecommServiceImpl#acceptRingingCall + * @see TelecomServiceImpl#acceptRingingCall */ void acceptRingingCall(); /** - * @see TelecommServiceImpl#cancelMissedCallsNotification + * @see TelecomServiceImpl#cancelMissedCallsNotification */ void cancelMissedCallsNotification(); /** - * @see TelecommServiceImpl#handleMmi + * @see TelecomServiceImpl#handleMmi */ boolean handlePinMmi(String dialString); /** - * @see TelecommServiceImpl#isTtySupported + * @see TelecomServiceImpl#isTtySupported */ boolean isTtySupported(); /** - * @see TelecommServiceImpl#getCurrentTtyMode + * @see TelecomServiceImpl#getCurrentTtyMode */ int getCurrentTtyMode(); /** - * @see TelecommServiceImpl#addNewIncomingCall + * @see TelecomServiceImpl#addNewIncomingCall */ void addNewIncomingCall(in PhoneAccountHandle phoneAccount, in Bundle extras); } diff --git a/telecomm/java/com/android/internal/telecomm/IVideoCallback.aidl b/telecomm/java/com/android/internal/telecom/IVideoCallback.aidl index 186f083..f758b60 100644 --- a/telecomm/java/com/android/internal/telecomm/IVideoCallback.aidl +++ b/telecomm/java/com/android/internal/telecom/IVideoCallback.aidl @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.internal.telecomm; +package com.android.internal.telecom; -import android.telecomm.CameraCapabilities; -import android.telecomm.VideoProfile; +import android.telecom.CameraCapabilities; +import android.telecom.VideoProfile; /** * Internal definition of a callback interface, used for an InCallUi to respond to video * telephony changes. * - * @see android.telecomm.InCallService.VideoCall.Listener + * @see android.telecom.InCallService.VideoCall.Listener * * {@hide} */ diff --git a/telecomm/java/com/android/internal/telecomm/IVideoProvider.aidl b/telecomm/java/com/android/internal/telecom/IVideoProvider.aidl index b0aa988..e96d9d3 100644 --- a/telecomm/java/com/android/internal/telecomm/IVideoProvider.aidl +++ b/telecomm/java/com/android/internal/telecom/IVideoProvider.aidl @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.android.internal.telecomm; +package com.android.internal.telecom; import android.view.Surface; -import android.telecomm.VideoProfile; +import android.telecom.VideoProfile; /** * Internal remote interface for a video call provider. - * @see android.telecomm.VideoProvider + * @see android.telecom.VideoProvider * @hide */ oneway interface IVideoProvider { diff --git a/telecomm/java/com/android/internal/telecomm/RemoteServiceCallback.aidl b/telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl index 0ab7564..441704d 100644 --- a/telecomm/java/com/android/internal/telecomm/RemoteServiceCallback.aidl +++ b/telecomm/java/com/android/internal/telecom/RemoteServiceCallback.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.telecomm; +package com.android.internal.telecom; import android.content.ComponentName; diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java index aa6c47c..6366c91 100644 --- a/telephony/java/android/telephony/DisconnectCause.java +++ b/telephony/java/android/telephony/DisconnectCause.java @@ -155,7 +155,7 @@ public class DisconnectCause { public static final int OUTGOING_FAILURE = 43; /** - * The outgoing call was canceled by the {@link android.telecomm.ConnectionService}. + * The outgoing call was canceled by the {@link android.telecom.ConnectionService}. */ public static final int OUTGOING_CANCELED = 44; diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 9f94040..6e3325b 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -26,9 +26,8 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.SystemProperties; import android.util.Log; -import android.util.Pair; -import com.android.internal.telecomm.ITelecommService; +import com.android.internal.telecom.ITelecomService; import com.android.internal.telephony.IPhoneSubInfo; import com.android.internal.telephony.ITelephony; import com.android.internal.telephony.ITelephonyRegistry; @@ -63,8 +62,6 @@ import java.util.regex.Pattern; public class TelephonyManager { private static final String TAG = "TelephonyManager"; - private static final String TELECOMM_SERVICE_NAME = "telecomm"; - private static ITelephonyRegistry sRegistry; /** @@ -2145,8 +2142,8 @@ public class TelephonyManager { return ITelephony.Stub.asInterface(ServiceManager.getService(Context.TELEPHONY_SERVICE)); } - private ITelecommService getTelecommService() { - return ITelecommService.Stub.asInterface(ServiceManager.getService(TELECOMM_SERVICE_NAME)); + private ITelecomService getTelecommService() { + return ITelecomService.Stub.asInterface(ServiceManager.getService(Context.TELECOM_SERVICE)); } // @@ -3137,7 +3134,7 @@ public class TelephonyManager { try { getTelecommService().silenceRinger(); } catch (RemoteException e) { - Log.e(TAG, "Error calling ITelecommService#silenceRinger", e); + Log.e(TAG, "Error calling ITelecomService#silenceRinger", e); } } diff --git a/telephony/java/com/android/ims/ImsCallProfile.java b/telephony/java/com/android/ims/ImsCallProfile.java index 767ecf9..8b7901c 100644 --- a/telephony/java/com/android/ims/ImsCallProfile.java +++ b/telephony/java/com/android/ims/ImsCallProfile.java @@ -19,7 +19,7 @@ package com.android.ims; import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.telecomm.VideoProfile; +import android.telecom.VideoProfile; import com.android.internal.telephony.PhoneConstants; diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl index 67bfe41..f867fcb 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl @@ -16,8 +16,8 @@ package com.android.ims.internal; -import android.telecomm.CameraCapabilities; -import android.telecomm.VideoProfile; +import android.telecom.CameraCapabilities; +import android.telecom.VideoProfile; /** * Internal remote interface for IMS's video call provider. @@ -26,8 +26,8 @@ import android.telecomm.VideoProfile; * separate aidl interface for invoking callbacks in Telephony from the IMS Service to without * accessing internal interfaces. See {@link IImsVideoCallProvider} for additional detail. * - * @see android.telecomm.internal.IVideoCallCallback - * @see android.telecomm.VideoCallImpl + * @see android.telecom.internal.IVideoCallCallback + * @see android.telecom.VideoCallImpl * * {@hide} */ diff --git a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl index 4db0d14..1fd88e7 100644 --- a/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl +++ b/telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl @@ -17,7 +17,7 @@ package com.android.ims.internal; import android.view.Surface; -import android.telecomm.VideoProfile; +import android.telecom.VideoProfile; import com.android.ims.internal.IImsVideoCallCallback; @@ -35,8 +35,8 @@ import com.android.ims.internal.IImsVideoCallCallback; * video call provider will not have the benefit of accessing the internal * {@link IVideoCallProvider} aidl for interprocess communication. * - * @see android.telecomm.internal.IVideoCallProvider - * @see android.telecomm.VideoCallProvider + * @see android.telecom.internal.IVideoCallProvider + * @see android.telecom.VideoCallProvider * @hide */ oneway interface IImsVideoCallProvider { |