Skip to content

Commit

Permalink
Renaming Telecomm to Telecom.
Browse files Browse the repository at this point in the history 
- Changing package from android.telecomm to android.telecom
- Changing package from com.android.telecomm to
com.android.server.telecomm.
- Renaming TelecommManager to TelecomManager.

Bug: 17364651
Change-Id: I192cb5d189f55db012ea72ee82ccc5aedbc21638
  • Loading branch information
Tyler Gunn committed Sep 13, 2014
1 parent 4b5c2d3 commit ef9f6f9
Show file tree
Hide file tree
Showing 68 changed files with 481 additions and 495 deletions.
16 changes: 8 additions & 8 deletions Android.mk
View file
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion CleanSpec.mk
View file
Expand Up @@ -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)
Expand All @@ -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
Expand Down
182 changes: 91 additions & 91 deletions api/current.txt
View file

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions core/java/android/app/ContextImpl.java
View file
Expand Up @@ -124,7 +124,7 @@
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;
Expand All @@ -148,7 +148,7 @@
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;
Expand Down Expand Up @@ -562,9 +562,9 @@ public Object createService(ContextImpl ctx) {
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() {
Expand Down
8 changes: 4 additions & 4 deletions core/java/android/content/Context.java
View file
Expand Up @@ -2115,7 +2115,7 @@ public abstract boolean startInstrumentation(@NonNull ComponentName className,
AUDIO_SERVICE,
MEDIA_ROUTER_SERVICE,
TELEPHONY_SERVICE,
TELECOMM_SERVICE,
TELECOM_SERVICE,
CLIPBOARD_SERVICE,
INPUT_METHOD_SERVICE,
TEXT_SERVICES_MANAGER_SERVICE,
Expand Down Expand Up @@ -2588,13 +2588,13 @@ public abstract boolean startInstrumentation(@NonNull ComponentName className,

/**
* 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
Expand Down
2 changes: 1 addition & 1 deletion core/java/android/provider/CallLog.java
View file
Expand Up @@ -33,7 +33,7 @@
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;

Expand Down
6 changes: 3 additions & 3 deletions core/java/com/android/internal/widget/LockPatternUtils.java
View file
Expand Up @@ -35,7 +35,7 @@
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;
Expand Down Expand Up @@ -1477,8 +1477,8 @@ public boolean isInCall() {
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() {
Expand Down
9 changes: 4 additions & 5 deletions media/java/android/media/AudioService.java
View file
Expand Up @@ -25,7 +25,6 @@
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;
Expand Down Expand Up @@ -68,7 +67,7 @@
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;
Expand Down Expand Up @@ -2939,9 +2938,9 @@ private void ensureValidStreamType(int streamType) {
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);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
View file
Expand Up @@ -30,7 +30,7 @@
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;
Expand Down Expand Up @@ -331,7 +331,7 @@ public void launchCamera() {
}

public void launchPhone() {
final TelecommManager tm = TelecommManager.from(mContext);
final TelecomManager tm = TelecomManager.from(mContext);
if (tm.isInCall()) {
AsyncTask.execute(new Runnable() {
@Override
Expand Down
12 changes: 6 additions & 6 deletions packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
View file
Expand Up @@ -27,7 +27,7 @@
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;
Expand Down Expand Up @@ -93,7 +93,7 @@ else if (action.equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) {
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)) {
Expand All @@ -115,7 +115,7 @@ public PhoneStatusBarPolicy(Context context, CastController cast) {
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);

Expand Down Expand Up @@ -279,9 +279,9 @@ private final void updateBluetooth(Intent intent) {
}

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);

Expand Down
52 changes: 26 additions & 26 deletions policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View file
Expand Up @@ -72,7 +72,7 @@
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;
Expand Down Expand Up @@ -2131,8 +2131,8 @@ static IDreamManager getDreamManager() {
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() {
Expand Down Expand Up @@ -2221,8 +2221,8 @@ public long interceptKeyBeforeDispatching(WindowState win, KeyEvent event, int p
// 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;
}
Expand Down Expand Up @@ -4322,9 +4322,9 @@ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags) {
}
}
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
Expand All @@ -4336,14 +4336,14 @@ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags) {

// 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.
Expand All @@ -4369,10 +4369,10 @@ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags) {
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 {
Expand Down Expand Up @@ -4409,19 +4409,19 @@ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags) {
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
Expand Down Expand Up @@ -4459,9 +4459,9 @@ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags) {
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;
Expand Down Expand Up @@ -4494,12 +4494,12 @@ public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags) {

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.)
Expand Down
6 changes: 3 additions & 3 deletions services/core/java/com/android/server/notification/ZenModeHelper.java
View file
Expand Up @@ -40,7 +40,7 @@
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;

Expand Down Expand Up @@ -346,8 +346,8 @@ private boolean isCall(NotificationRecord record) {

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);
}
Expand Down
2 changes: 1 addition & 1 deletion ...omm/java/android/telecomm/AudioState.aidl → ...comm/java/android/telecom/AudioState.aidl
View file
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package android.telecomm;
package android.telecom;

/**
* {@hide}
Expand Down
2 changes: 1 addition & 1 deletion ...omm/java/android/telecomm/AudioState.java → ...comm/java/android/telecom/AudioState.java
View file
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package android.telecomm;
package android.telecom;

import android.os.Parcel;
import android.os.Parcelable;
Expand Down

0 comments on commit ef9f6f9

Please sign in to comment.