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

Commit bc027275 authored by Wink Saville's avatar Wink Saville
Browse files

Change suffix UsingSubId to ForSubscriber.

Bug: 17255752
Change-Id: Ifd522888b5aaae111f642d1e35bd1bb939e539d4
parent 8fd30e44
Loading
Loading
Loading
Loading
+43 −43
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
                    if (VDBG) log("MSG_USER_SWITCHED userId=" + msg.arg1);
                    int numPhones = TelephonyManager.getDefault().getPhoneCount();
                    for (int sub = 0; sub < numPhones; sub++) {
                        TelephonyRegistry.this.notifyCellLocationUsingSubId(sub,
                        TelephonyRegistry.this.notifyCellLocationForSubscriber(sub,
                                mCellLocation[sub]);
                    }
                    break;
@@ -326,7 +326,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    }

    @Override
    public void listenUsingSubId(long subId, String pkgForDebug, IPhoneStateListener callback,
    public void listenForSubscriber(long subId, String pkgForDebug, IPhoneStateListener callback,
            int events, boolean notifyNow) {
        listen(pkgForDebug, callback, events, notifyNow, subId, false);
    }
@@ -542,12 +542,12 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
        broadcastCallStateChanged(state, incomingNumber, mDefaultSubId);
    }

    public void notifyCallStateUsingSubId(long subId, int state, String incomingNumber) {
    public void notifyCallStateForSubscriber(long subId, int state, String incomingNumber) {
        if (!checkNotifyPermission("notifyCallState()")) {
            return;
        }
        if (VDBG) {
            log("notifyCallStateUsingSubId: subId=" + subId
            log("notifyCallStateForSubscriber: subId=" + subId
                + " state=" + state + " incomingNumber=" + incomingNumber);
        }
        synchronized (mRecords) {
@@ -573,38 +573,38 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    }

     public void notifyServiceState(ServiceState state) {
         notifyServiceStateUsingSubId(mDefaultSubId, state);
         notifyServiceStateForSubscriber(mDefaultSubId, state);
     }

    public void notifyServiceStateUsingSubId(long subId, ServiceState state) {
    public void notifyServiceStateForSubscriber(long subId, ServiceState state) {
        if (!checkNotifyPermission("notifyServiceState()")){
            return;
        }
        if (subId == SubscriptionManager.DEFAULT_SUB_ID) {
            subId = mDefaultSubId;
            if (VDBG) log("notifyServiceStateUsingSubId: using mDefaultSubId=" + mDefaultSubId);
            if (VDBG) log("notifyServiceStateForSubscriber: using mDefaultSubId=" + mDefaultSubId);
        }
        synchronized (mRecords) {
            int phoneId = SubscriptionManager.getPhoneId(subId);
            if (VDBG) {
                log("notifyServiceStateUsingSubId: subId=" + subId + " phoneId=" + phoneId
                log("notifyServiceStateForSubscriber: subId=" + subId + " phoneId=" + phoneId
                    + " state=" + state);
            }
            if (validatePhoneId(phoneId)) {
                mServiceState[phoneId] = state;
                logServiceStateChanged("notifyServiceStateUsingSubId", subId, phoneId, state);
                if (VDBG) toStringLogSSC("notifyServiceStateUsingSubId");
                logServiceStateChanged("notifyServiceStateForSubscriber", subId, phoneId, state);
                if (VDBG) toStringLogSSC("notifyServiceStateForSubscriber");

                for (Record r : mRecords) {
                    if (VDBG) {
                        log("notifyServiceStateUsingSubId: r=" + r + " subId=" + subId
                        log("notifyServiceStateForSubscriber: r=" + r + " subId=" + subId
                                + " phoneId=" + phoneId + " state=" + state);
                    }
                    if (((r.events & PhoneStateListener.LISTEN_SERVICE_STATE) != 0) &&
                        (r.phoneId == phoneId)) {
                        try {
                            if (DBG) {
                                log("notifyServiceStateUsingSubId: callback.onSSC r=" + r
                                log("notifyServiceStateForSubscriber: callback.onSSC r=" + r
                                        + " subId=" + subId + " phoneId=" + phoneId
                                        + " state=" + state);
                            }
@@ -615,7 +615,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
                    }
                }
            } else {
                log("notifyServiceStateUsingSubId: INVALID phoneId=" + phoneId);
                log("notifyServiceStateForSubscriber: INVALID phoneId=" + phoneId);
            }
            handleRemoveListLocked();
        }
@@ -623,33 +623,33 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    }

    public void notifySignalStrength(SignalStrength signalStrength) {
        notifySignalStrengthUsingSubId(mDefaultSubId, signalStrength);
        notifySignalStrengthForSubscriber(mDefaultSubId, signalStrength);
    }

    public void notifySignalStrengthUsingSubId(long subId, SignalStrength signalStrength) {
    public void notifySignalStrengthForSubscriber(long subId, SignalStrength signalStrength) {
        if (!checkNotifyPermission("notifySignalStrength()")) {
            return;
        }
        if (VDBG) {
            log("notifySignalStrengthUsingSubId: subId=" + subId
            log("notifySignalStrengthForSubscriber: subId=" + subId
                + " signalStrength=" + signalStrength);
            toStringLogSSC("notifySignalStrengthUsingSubId");
            toStringLogSSC("notifySignalStrengthForSubscriber");
        }
        synchronized (mRecords) {
            int phoneId = SubscriptionManager.getPhoneId(subId);
            if (validatePhoneId(phoneId)) {
                if (VDBG) log("notifySignalStrengthUsingSubId: valid phoneId=" + phoneId);
                if (VDBG) log("notifySignalStrengthForSubscriber: valid phoneId=" + phoneId);
                mSignalStrength[phoneId] = signalStrength;
                for (Record r : mRecords) {
                    if (VDBG) {
                        log("notifySignalStrengthUsingSubId: r=" + r + " subId=" + subId
                        log("notifySignalStrengthForSubscriber: r=" + r + " subId=" + subId
                                + " phoneId=" + phoneId + " ss=" + signalStrength);
                    }
                    if (((r.events & PhoneStateListener.LISTEN_SIGNAL_STRENGTHS) != 0) &&
                        (r.phoneId == phoneId)) {
                        try {
                            if (DBG) {
                                log("notifySignalStrengthUsingSubId: callback.onSsS r=" + r
                                log("notifySignalStrengthForSubscriber: callback.onSsS r=" + r
                                        + " subId=" + subId + " phoneId=" + phoneId
                                        + " ss=" + signalStrength);
                            }
@@ -664,7 +664,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
                            int gsmSignalStrength = signalStrength.getGsmSignalStrength();
                            int ss = (gsmSignalStrength == 99 ? -1 : gsmSignalStrength);
                            if (DBG) {
                                log("notifySignalStrengthUsingSubId: callback.onSS r=" + r
                                log("notifySignalStrengthForSubscriber: callback.onSS r=" + r
                                        + " subId=" + subId + " phoneId=" + phoneId
                                        + " gsmSS=" + gsmSignalStrength + " ss=" + ss);
                            }
@@ -675,7 +675,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
                    }
                }
            } else {
                log("notifySignalStrengthUsingSubId: invalid phoneId=" + phoneId);
                log("notifySignalStrengthForSubscriber: invalid phoneId=" + phoneId);
            }
            handleRemoveListLocked();
        }
@@ -683,15 +683,15 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    }

    public void notifyCellInfo(List<CellInfo> cellInfo) {
         notifyCellInfoUsingSubId(mDefaultSubId, cellInfo);
         notifyCellInfoForSubscriber(mDefaultSubId, cellInfo);
    }

    public void notifyCellInfoUsingSubId(long subId, List<CellInfo> cellInfo) {
    public void notifyCellInfoForSubscriber(long subId, List<CellInfo> cellInfo) {
        if (!checkNotifyPermission("notifyCellInfo()")) {
            return;
        }
        if (VDBG) {
            log("notifyCellInfoUsingSubId: subId=" + subId
            log("notifyCellInfoForSubscriber: subId=" + subId
                + " cellInfo=" + cellInfo);
        }

@@ -743,15 +743,15 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    }

    public void notifyMessageWaitingChanged(boolean mwi) {
        notifyMessageWaitingChangedUsingSubId(mDefaultSubId, mwi);
        notifyMessageWaitingChangedForSubscriber(mDefaultSubId, mwi);
    }

    public void notifyMessageWaitingChangedUsingSubId(long subId, boolean mwi) {
    public void notifyMessageWaitingChangedForSubscriber(long subId, boolean mwi) {
        if (!checkNotifyPermission("notifyMessageWaitingChanged()")) {
            return;
        }
        if (VDBG) {
            log("notifyMessageWaitingChangedUsingSubId: subId=" + subId
            log("notifyMessageWaitingChangedForSubscriber: subId=" + subId
                + " mwi=" + mwi);
        }
        synchronized (mRecords) {
@@ -774,15 +774,15 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    }

    public void notifyCallForwardingChanged(boolean cfi) {
        notifyCallForwardingChangedUsingSubId(mDefaultSubId, cfi);
        notifyCallForwardingChangedForSubscriber(mDefaultSubId, cfi);
    }

    public void notifyCallForwardingChangedUsingSubId(long subId, boolean cfi) {
    public void notifyCallForwardingChangedForSubscriber(long subId, boolean cfi) {
        if (!checkNotifyPermission("notifyCallForwardingChanged()")) {
            return;
        }
        if (VDBG) {
            log("notifyCallForwardingChangedUsingSubId: subId=" + subId
            log("notifyCallForwardingChangedForSubscriber: subId=" + subId
                + " cfi=" + cfi);
        }
        synchronized (mRecords) {
@@ -805,10 +805,10 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    }

    public void notifyDataActivity(int state) {
        notifyDataActivityUsingSubId(mDefaultSubId, state);
        notifyDataActivityForSubscriber(mDefaultSubId, state);
    }

    public void notifyDataActivityUsingSubId(long subId, int state) {
    public void notifyDataActivityForSubscriber(long subId, int state) {
        if (!checkNotifyPermission("notifyDataActivity()" )) {
            return;
        }
@@ -831,12 +831,12 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    public void notifyDataConnection(int state, boolean isDataConnectivityPossible,
            String reason, String apn, String apnType, LinkProperties linkProperties,
            NetworkCapabilities networkCapabilities, int networkType, boolean roaming) {
        notifyDataConnectionUsingSubId(mDefaultSubId, state, isDataConnectivityPossible,
        notifyDataConnectionForSubscriber(mDefaultSubId, state, isDataConnectivityPossible,
            reason, apn, apnType, linkProperties,
            networkCapabilities, networkType, roaming);
    }

    public void notifyDataConnectionUsingSubId(long subId, int state,
    public void notifyDataConnectionForSubscriber(long subId, int state,
            boolean isDataConnectivityPossible, String reason, String apn, String apnType,
            LinkProperties linkProperties, NetworkCapabilities networkCapabilities,
            int networkType, boolean roaming) {
@@ -844,7 +844,7 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
            return;
        }
        if (VDBG) {
            log("notifyDataConnectionUsingSubId: subId=" + subId
            log("notifyDataConnectionForSubscriber: subId=" + subId
                + " state=" + state + " isDataConnectivityPossible=" + isDataConnectivityPossible
                + " reason='" + reason
                + "' apn='" + apn + "' apnType=" + apnType + " networkType=" + networkType
@@ -921,16 +921,16 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    }

    public void notifyDataConnectionFailed(String reason, String apnType) {
         notifyDataConnectionFailedUsingSubId(mDefaultSubId, reason, apnType);
         notifyDataConnectionFailedForSubscriber(mDefaultSubId, reason, apnType);
    }

    public void notifyDataConnectionFailedUsingSubId(long subId,
    public void notifyDataConnectionFailedForSubscriber(long subId,
            String reason, String apnType) {
        if (!checkNotifyPermission("notifyDataConnectionFailed()")) {
            return;
        }
        if (VDBG) {
            log("notifyDataConnectionFailedUsingSubId: subId=" + subId
            log("notifyDataConnectionFailedForSubscriber: subId=" + subId
                + " reason=" + reason + " apnType=" + apnType);
        }
        synchronized (mRecords) {
@@ -954,17 +954,17 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
    }

    public void notifyCellLocation(Bundle cellLocation) {
         notifyCellLocationUsingSubId(mDefaultSubId, cellLocation);
         notifyCellLocationForSubscriber(mDefaultSubId, cellLocation);
    }

    public void notifyCellLocationUsingSubId(long subId, Bundle cellLocation) {
        log("notifyCellLocationUsingSubId: subId=" + subId
    public void notifyCellLocationForSubscriber(long subId, Bundle cellLocation) {
        log("notifyCellLocationForSubscriber: subId=" + subId
                + " cellLocation=" + cellLocation);
        if (!checkNotifyPermission("notifyCellLocation()")) {
            return;
        }
        if (VDBG) {
            log("notifyCellLocationUsingSubId: subId=" + subId
            log("notifyCellLocationForSubscriber: subId=" + subId
                + " cellLocation=" + cellLocation);
        }
        synchronized (mRecords) {
+6 −6
Original line number Diff line number Diff line
@@ -265,9 +265,9 @@ public class SubscriptionManager implements BaseColumns {
     * @return SubInfoRecord, maybe null
     * @hide - to be unhidden
     */
    public static SubInfoRecord getSubInfoUsingSubId(long subId) {
    public static SubInfoRecord getSubInfoForSubscriber(long subId) {
        if (!isValidSubId(subId)) {
            logd("[getSubInfoUsingSubIdx]- invalid subId");
            logd("[getSubInfoForSubscriberx]- invalid subId");
            return null;
        }

@@ -276,7 +276,7 @@ public class SubscriptionManager implements BaseColumns {
        try {
            ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));
            if (iSub != null) {
                subInfo = iSub.getSubInfoUsingSubId(subId);
                subInfo = iSub.getSubInfoForSubscriber(subId);
            }
        } catch (RemoteException ex) {
            // ignore it
@@ -783,7 +783,7 @@ public class SubscriptionManager implements BaseColumns {

    /** @hide */
    public static SubInfoRecord getDefaultVoiceSubInfo() {
        return getSubInfoUsingSubId(getDefaultVoiceSubId());
        return getSubInfoForSubscriber(getDefaultVoiceSubId());
    }

    /** @hide */
@@ -826,7 +826,7 @@ public class SubscriptionManager implements BaseColumns {

    /** @hide */
    public static SubInfoRecord getDefaultSmsSubInfo() {
        return getSubInfoUsingSubId(getDefaultSmsSubId());
        return getSubInfoForSubscriber(getDefaultSmsSubId());
    }

    /** @hide */
@@ -866,7 +866,7 @@ public class SubscriptionManager implements BaseColumns {

    /** @hide */
    public static SubInfoRecord getDefaultDataSubInfo() {
        return getSubInfoUsingSubId(getDefaultDataSubId());
        return getSubInfoForSubscriber(getDefaultDataSubId());
    }

    /** @hide */
+24 −24
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ public class TelephonyManager {
    public String getDeviceId(int slotId) {
        long[] subId = SubscriptionManager.getSubId(slotId);
        try {
            return getSubscriberInfo().getDeviceIdUsingSubId(subId[0]);
            return getSubscriberInfo().getDeviceIdForSubscriber(subId[0]);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -639,7 +639,7 @@ public class TelephonyManager {
    public String getImei(int slotId) {
        long[] subId = SubscriptionManager.getSubId(slotId);
        try {
            return getSubscriberInfo().getImeiUsingSubId(subId[0]);
            return getSubscriberInfo().getImeiForSubscriber(subId[0]);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -703,7 +703,7 @@ public class TelephonyManager {
    /** @hide */
    public void enableLocationUpdates(long subId) {
        try {
            getITelephony().enableLocationUpdatesUsingSubId(subId);
            getITelephony().enableLocationUpdatesForSubscriber(subId);
        } catch (RemoteException ex) {
        } catch (NullPointerException ex) {
        }
@@ -725,7 +725,7 @@ public class TelephonyManager {
    /** @hide */
    public void disableLocationUpdates(long subId) {
        try {
            getITelephony().disableLocationUpdatesUsingSubId(subId);
            getITelephony().disableLocationUpdatesForSubscriber(subId);
        } catch (RemoteException ex) {
        } catch (NullPointerException ex) {
        }
@@ -793,7 +793,7 @@ public class TelephonyManager {
        try{
            ITelephony telephony = getITelephony();
            if (telephony != null) {
                return telephony.getActivePhoneTypeUsingSubId(subId);
                return telephony.getActivePhoneTypeForSubscriber(subId);
            } else {
                // This can happen when the ITelephony interface is not up yet.
                return getPhoneTypeFromProperty(subId);
@@ -1159,7 +1159,7 @@ public class TelephonyManager {
       try {
           ITelephony telephony = getITelephony();
           if (telephony != null) {
               return telephony.getNetworkTypeUsingSubId(subId);
               return telephony.getNetworkTypeForSubscriber(subId);
           } else {
               // This can happen when the ITelephony interface is not up yet.
               return NETWORK_TYPE_UNKNOWN;
@@ -1213,7 +1213,7 @@ public class TelephonyManager {
        try{
            ITelephony telephony = getITelephony();
            if (telephony != null) {
                return telephony.getDataNetworkTypeUsingSubId(subId);
                return telephony.getDataNetworkTypeForSubscriber(subId);
            } else {
                // This can happen when the ITelephony interface is not up yet.
                return NETWORK_TYPE_UNKNOWN;
@@ -1245,7 +1245,7 @@ public class TelephonyManager {
        try{
            ITelephony telephony = getITelephony();
            if (telephony != null) {
                return telephony.getVoiceNetworkTypeUsingSubId(subId);
                return telephony.getVoiceNetworkTypeForSubscriber(subId);
            } else {
                // This can happen when the ITelephony interface is not up yet.
                return NETWORK_TYPE_UNKNOWN;
@@ -1572,7 +1572,7 @@ public class TelephonyManager {
    /** {@hide} */
    public String getSimSerialNumber(long subId) {
        try {
            return getSubscriberInfo().getIccSerialNumberUsingSubId(subId);
            return getSubscriberInfo().getIccSerialNumberForSubscriber(subId);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -1608,7 +1608,7 @@ public class TelephonyManager {
    /** {@hide} */
    public int getLteOnCdmaMode(long subId) {
        try {
            return getITelephony().getLteOnCdmaModeUsingSubId(subId);
            return getITelephony().getLteOnCdmaModeForSubscriber(subId);
        } catch (RemoteException ex) {
            // Assume no ICC card if remote exception which shouldn't happen
            return PhoneConstants.LTE_ON_CDMA_UNKNOWN;
@@ -1648,7 +1648,7 @@ public class TelephonyManager {
    /** {@hide} */
    public String getSubscriberId(long subId) {
        try {
            return getSubscriberInfo().getSubscriberIdUsingSubId(subId);
            return getSubscriberInfo().getSubscriberIdForSubscriber(subId);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -1687,7 +1687,7 @@ public class TelephonyManager {
    /** {@hide} */
    public String getGroupIdLevel1(long subId) {
        try {
            return getSubscriberInfo().getGroupIdLevel1UsingSubId(subId);
            return getSubscriberInfo().getGroupIdLevel1ForSubscriber(subId);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -1728,7 +1728,7 @@ public class TelephonyManager {
            return number;
        }
        try {
            return getSubscriberInfo().getLine1NumberUsingSubId(subId);
            return getSubscriberInfo().getLine1NumberForSubscriber(subId);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -1811,7 +1811,7 @@ public class TelephonyManager {
            return alphaTag;
        }
        try {
            return getSubscriberInfo().getLine1AlphaTagUsingSubId(subId);
            return getSubscriberInfo().getLine1AlphaTagForSubscriber(subId);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -1845,7 +1845,7 @@ public class TelephonyManager {
    /** {@hide} */
    public String getMsisdn(long subId) {
        try {
            return getSubscriberInfo().getMsisdnUsingSubId(subId);
            return getSubscriberInfo().getMsisdnForSubscriber(subId);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -1875,7 +1875,7 @@ public class TelephonyManager {
    /** {@hide} */
    public String getVoiceMailNumber(long subId) {
        try {
            return getSubscriberInfo().getVoiceMailNumberUsingSubId(subId);
            return getSubscriberInfo().getVoiceMailNumberForSubscriber(subId);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -1907,7 +1907,7 @@ public class TelephonyManager {
    /** {@hide} */
    public String getCompleteVoiceMailNumber(long subId) {
        try {
            return getSubscriberInfo().getCompleteVoiceMailNumberUsingSubId(subId);
            return getSubscriberInfo().getCompleteVoiceMailNumberForSubscriber(subId);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -1937,7 +1937,7 @@ public class TelephonyManager {
    /** {@hide} */
    public int getVoiceMessageCount(long subId) {
        try {
            return getITelephony().getVoiceMessageCountUsingSubId(subId);
            return getITelephony().getVoiceMessageCountForSubscriber(subId);
        } catch (RemoteException ex) {
            return 0;
        } catch (NullPointerException ex) {
@@ -1969,7 +1969,7 @@ public class TelephonyManager {
    /** {@hide} */
    public String getVoiceMailAlphaTag(long subId) {
        try {
            return getSubscriberInfo().getVoiceMailAlphaTagUsingSubId(subId);
            return getSubscriberInfo().getVoiceMailAlphaTagForSubscriber(subId);
        } catch (RemoteException ex) {
            return null;
        } catch (NullPointerException ex) {
@@ -2059,7 +2059,7 @@ public class TelephonyManager {
    /** {@hide} */
    public int getCallState(long subId) {
        try {
            return getITelephony().getCallStateUsingSubId(subId);
            return getITelephony().getCallStateForSubscriber(subId);
        } catch (RemoteException ex) {
            // the phone process is restarting.
            return CALL_STATE_IDLE;
@@ -2181,7 +2181,7 @@ public class TelephonyManager {
        String pkgForDebug = mContext != null ? mContext.getPackageName() : "<unknown>";
        try {
            Boolean notifyNow = (getITelephony() != null);
            sRegistry.listenUsingSubId(listener.mSubId, pkgForDebug, listener.callback, events, notifyNow);
            sRegistry.listenForSubscriber(listener.mSubId, pkgForDebug, listener.callback, events, notifyNow);
        } catch (RemoteException ex) {
            // system process dead
        } catch (NullPointerException ex) {
@@ -2204,7 +2204,7 @@ public class TelephonyManager {
    /** {@hide} */
    public int getCdmaEriIconIndex(long subId) {
        try {
            return getITelephony().getCdmaEriIconIndexUsingSubId(subId);
            return getITelephony().getCdmaEriIconIndexForSubscriber(subId);
        } catch (RemoteException ex) {
            // the phone process is restarting.
            return -1;
@@ -2232,7 +2232,7 @@ public class TelephonyManager {
    /** {@hide} */
    public int getCdmaEriIconMode(long subId) {
        try {
            return getITelephony().getCdmaEriIconModeUsingSubId(subId);
            return getITelephony().getCdmaEriIconModeForSubscriber(subId);
        } catch (RemoteException ex) {
            // the phone process is restarting.
            return -1;
@@ -2257,7 +2257,7 @@ public class TelephonyManager {
    /** {@hide} */
    public String getCdmaEriText(long subId) {
        try {
            return getITelephony().getCdmaEriTextUsingSubId(subId);
            return getITelephony().getCdmaEriTextForSubscriber(subId);
        } catch (RemoteException ex) {
            // the phone process is restarting.
            return null;
+11 −11

File changed.

Preview size limit exceeded, changes collapsed.

+14 −14

File changed.

Preview size limit exceeded, changes collapsed.

Loading