Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6f25963e: Merge "Remove setCdmaSubscription API." into lmp-dev

Browse Source 
* commit '6f25963ebc8f91638b056107a7b7bdb6e182102f':
  Remove setCdmaSubscription API.
This commit is contained in:
Derek Tan
2014-09-06 00:02:58 +00:00
committed by Android Git Automerger
parent 0bee5f5208 b5928445d1
commit 22a3cf8349
3 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -29048,7 +29048,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);

22
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -3013,28 +3013,6 @@ public class TelephonyManager {
return false;
}
/**
* 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.
*/

9
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -659,15 +659,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.
*