diff options
| author | Derek Tan <derektan@google.com> | 2014-09-06 00:02:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-06 00:02:58 +0000 |
| commit | 22a3cf83497bc7337d3f75bb837d95346e124033 (patch) | |
| tree | 18dac2b7df28e24044f05fe83cc620bffe2ea54e /telephony | |
| parent | 0bee5f5208768613214d4e358dd4b2fe0c621a6d (diff) | |
| parent | b5928445d12d92598845bcef3cd019aa09acb12d (diff) | |
| download | frameworks_base-22a3cf83497bc7337d3f75bb837d95346e124033.zip frameworks_base-22a3cf83497bc7337d3f75bb837d95346e124033.tar.gz frameworks_base-22a3cf83497bc7337d3f75bb837d95346e124033.tar.bz2 | |
am 6f25963e: Merge "Remove setCdmaSubscription API." into lmp-dev
* commit '6f25963ebc8f91638b056107a7b7bdb6e182102f':
Remove setCdmaSubscription API.
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 82971b1..b0238d7 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3014,28 +3014,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 756b305..1a50914 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -660,15 +660,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 |