Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b51263b9: am 21282583: am 66c16547: Merge "Renaming Telecomm to Telecom." into lmp-dev

Browse Source 
* commit 'b51263b99fc2c8293e1f0fe844e65ce2afec2089':
  Renaming Telecomm to Telecom.
This commit is contained in:
Tyler Gunn
2014-09-13 18:19:31 +00:00
committed by Android Git Automerger
parent 7387063b79 8bc3996189
commit cc616bca0d
68 changed files with 481 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/DisconnectCause.java
View File

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

11
telephony/java/android/telephony/TelephonyManager.java
View File

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

2
telephony/java/com/android/ims/ImsCallProfile.java
View File

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

8
telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl
View File

@@ -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}
*/

6
telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl
View File

@@ -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 {