Merge "remove deprecated API sendDialerCode" into oc-dev

This commit is contained in:
Chen Xu
2017-04-07 15:53:07 +00:00
committed by Android (Google) Code Review
5 changed files with 0 additions and 30 deletions

View File

@@ -40153,7 +40153,6 @@ package android.telephony {
method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);
method public boolean isWorldPhone();
method public void listen(android.telephony.PhoneStateListener, int);
method public deprecated boolean sendDialerCode(java.lang.String);
method public void sendDialerSpecialCode(java.lang.String);
method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
method public void sendUssdRequest(java.lang.String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

View File

@@ -43653,7 +43653,6 @@ package android.telephony {
method public boolean isWorldPhone();
method public void listen(android.telephony.PhoneStateListener, int);
method public boolean needsOtaServiceProvisioning();
method public deprecated boolean sendDialerCode(java.lang.String);
method public void sendDialerSpecialCode(java.lang.String);
method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
method public void sendUssdRequest(java.lang.String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

View File

@@ -40352,7 +40352,6 @@ package android.telephony {
method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);
method public boolean isWorldPhone();
method public void listen(android.telephony.PhoneStateListener, int);
method public deprecated boolean sendDialerCode(java.lang.String);
method public void sendDialerSpecialCode(java.lang.String);
method public java.lang.String sendEnvelopeWithStatus(java.lang.String);
method public void sendUssdRequest(java.lang.String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

View File

@@ -3105,30 +3105,6 @@ public class TelephonyManager {
}
}
/**
* Send the special dialer code. The IPC caller must be the current default dialer.
* <p>
* Requires Permission:
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}
*
* @param inputCode The special dialer code to send which follows the format of *#*#<code>#*#*
* @return true if sent sucessfully, false otherwise
* @deprecated use {@link #sendDialerSpecialCode(String)} ()} instead.
*/
public boolean sendDialerCode(String inputCode) {
try {
final ITelephony telephony = getITelephony();
if (telephony == null) {
Log.e(TAG, "Telephony service unavailable");
return false;
}
return telephony.sendDialerCode(mContext.getOpPackageName(), inputCode);
} catch (RemoteException | NullPointerException ex) {
// This could happen before phone restarts due to crashing
return false;
}
}
/**
* Send the special dialer code. The IPC caller must be the current default dialer or has
* carrier privileges.

View File

@@ -529,9 +529,6 @@ interface ITelephony {
void sendVisualVoicemailSmsForSubscriber(in String callingPackage, in int subId,
in String number, in int port, in String text, in PendingIntent sentIntent);
// Send the special dialer code. The IPC caller must be the current default dialer.
boolean sendDialerCode(String callingPackageName, String inputCode);
// Send the special dialer code. The IPC caller must be the current default dialer.
void sendDialerSpecialCode(String callingPackageName, String inputCode);