Remove dead method from TelephonyManager
TelephonyManager.getCompleteVoiceMailNumber &
TelephonyManager.getCompleteVoiceMailNumberForSubscriber have no
reference after lollipop. It's a good time to remove the dead code.
Test: no test
Bug: 78788614
Change-Id: I99091dd9a47f2b5aeca3d320e873b7b7c2baf36f
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 512ffb1..806357a 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3284,37 +3284,6 @@
}
/**
- * Returns the complete voice mail number. Return null if it is unavailable.
- *
- * @hide
- */
- @RequiresPermission(android.Manifest.permission.CALL_PRIVILEGED)
- public String getCompleteVoiceMailNumber() {
- return getCompleteVoiceMailNumber(getSubId());
- }
-
- /**
- * Returns the complete voice mail number. Return null if it is unavailable.
- *
- * @param subId
- * @hide
- */
- @RequiresPermission(android.Manifest.permission.CALL_PRIVILEGED)
- public String getCompleteVoiceMailNumber(int subId) {
- try {
- IPhoneSubInfo info = getSubscriberInfo();
- if (info == null)
- return null;
- return info.getCompleteVoiceMailNumberForSubscriber(subId);
- } catch (RemoteException ex) {
- return null;
- } catch (NullPointerException ex) {
- // This could happen before phone restarts due to crashing
- return null;
- }
- }
-
- /**
* Sets the voice mail number.
*
* <p>Requires that the calling app has carrier privileges (see {@link #hasCarrierPrivileges}).
diff --git a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
index 93964f3..abcb15a 100644
--- a/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
+++ b/telephony/java/com/android/internal/telephony/IPhoneSubInfo.aidl
@@ -125,16 +125,6 @@
String getVoiceMailNumberForSubscriber(int subId, String callingPackage);
/**
- * Retrieves the complete voice mail number.
- */
- String getCompleteVoiceMailNumber();
-
- /**
- * Retrieves the complete voice mail number for particular subId
- */
- String getCompleteVoiceMailNumberForSubscriber(int subId);
-
- /**
* Retrieves the Carrier information used to encrypt IMSI and IMPI.
*/
ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int subId, int keyType,