Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 274baa73 authored by Derek Tan's avatar Derek Tan
Browse files

Remove setCdmaSubscription API. 

Bug: 17255752
Change-Id: I0adc5c3d1b690d86f538c084d17d239f7ffccfca
parent 605e7192

api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -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);

telephony/java/android/telephony/TelephonyManager.java

+0 −22
Original line number Diff line number Diff line
@@ -2966,28 +2966,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.

     */

telephony/java/com/android/internal/telephony/ITelephony.aidl

+0 −9
Original line number Diff line number Diff line
@@ -642,15 +642,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.

     *