diff options
Diffstat (limited to 'core')
| -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 |
4 files changed, 12 insertions, 12 deletions
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() { |