Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ead6ad8a authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Renaming Telecomm to Telecom." into lmp-dev

parents 102f9398 ef9f6f95

Android.mk

+8 −8
Original line number Diff line number Diff line
@@ -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 \

CleanSpec.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

api/current.txt

+91 −91

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/ContextImpl.java

+4 −4
Original line number Diff line number Diff line
@@ -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() {

core/java/android/content/Context.java

+4 −4
Original line number Diff line number Diff line
@@ -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