diff options
-rw-r--r-- | api/current.txt | 1 | ||||
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 22 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 9 |
3 files changed, 0 insertions, 32 deletions
diff --git a/api/current.txt b/api/current.txt index eb1aedc..2a8f266 100644 --- a/api/current.txt +++ b/api/current.txt @@ -29046,7 +29046,6 @@ package android.telephony { method public boolean isSmsCapable(); method public void listen(android.telephony.PhoneStateListener, int); method public java.lang.String sendEnvelopeWithStatus(java.lang.String); - method public boolean setCdmaSubscription(int); method public void setLine1NumberForDisplay(java.lang.String, java.lang.String); method public void setLine1NumberForDisplay(long, java.lang.String, java.lang.String); method public boolean setOperatorBrandOverride(java.lang.String, java.lang.String); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index cdee3de..102b11f 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -2967,28 +2967,6 @@ public class TelephonyManager { } /** - * Set the CDMA subscription source. - * Used for device supporting both NV and RUIM for CDMA. - * <p> - * Requires Permission: - * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} - * Or the calling app has carrier privileges. @see #hasCarrierPrivileges - * - * @param subscriptionType the subscription type, 0 for RUIM, 1 for NV. - * @return true on success; false on any failure. - */ - public boolean setCdmaSubscription(int subscriptionType) { - try { - return getITelephony().setCdmaSubscription(subscriptionType); - } catch (RemoteException ex) { - Rlog.e(TAG, "setCdmaSubscription RemoteException", ex); - } catch (NullPointerException ex) { - Rlog.e(TAG, "setCdmaSubscription NPE", ex); - } - return false; - } - - /** * Values used to return status for hasCarrierPrivileges call. */ public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 5c3dcdb..fe8bc4e 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -643,15 +643,6 @@ interface ITelephony { boolean setPreferredNetworkType(int networkType); /** - * Set the CDMA subscription source. - * Used for device supporting both NV and RUIM for CDMA. - * - * @param subscriptionType the subscription type, 0 for RUIM, 1 for NV. - * @return true on success; false on any failure. - */ - boolean setCdmaSubscription(int subscriptionType); - - /** * User enable/disable Mobile Data. * * @param enable true to turn on, else false |