Merge "remove deprecated API sendDialerCode" into oc-dev
am: 31fcda576f
Change-Id: Ia1ca68529e16deaa990d07b651592a9a80806531
diff --git a/api/current.txt b/api/current.txt
index 2be26ce..fcd5c8c 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -40155,7 +40155,6 @@
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);
diff --git a/api/system-current.txt b/api/system-current.txt
index bb7c09e..02f4548 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -43655,7 +43655,6 @@
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);
diff --git a/api/test-current.txt b/api/test-current.txt
index 7c4a5d9..fb46031 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -40370,7 +40370,6 @@
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);
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 8357a2b..1fd1929 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3106,30 +3106,6 @@
}
/**
- * 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.
* @see #hasCarrierPrivileges
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index cd15c44..db7e417 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -530,9 +530,6 @@
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);
/**