diff options
author | Derek Tan <derektan@google.com> | 2014-09-05 23:53:54 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 23:53:55 +0000 |
commit | b5928445d12d92598845bcef3cd019aa09acb12d (patch) | |
tree | 05ca78a5a9a6ada9e65f51d76c062ab900b73a53 /telephony | |
parent | a0729d348764424b795cafc9ab175349009e5295 (diff) | |
parent | 274baa73c51490e10fffe2ccac9c626c8f459cc4 (diff) | |
download | frameworks_base-b5928445d12d92598845bcef3cd019aa09acb12d.zip frameworks_base-b5928445d12d92598845bcef3cd019aa09acb12d.tar.gz frameworks_base-b5928445d12d92598845bcef3cd019aa09acb12d.tar.bz2 |
Merge "Remove setCdmaSubscription API." into lmp-dev
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 22 | ||||
-rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 9 |
2 files changed, 0 insertions, 31 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 6c35058..0af1ca0 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 f587d72..79c72b88 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 |