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

Commit 917cd56b authored by Tom Taylor's avatar Tom Taylor
Browse files

Change SmsManager.getSmsManagerForSubId to getSmsManagerUsingSubId 

Bug 17371475

The agreed upon convention for SubId methods is xxxUsingSubId.

Change-Id: I3df09c5225f4331abe65868aded844a1334208c7
parent 0508a41a

src/java/android/telephony/SmsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ public final class SmsManager { 
     * @param subId a SMS subscription id, typically accessed using SubscriptionManager

     * @return the instance of the SmsManager associated with subId

     */

    public static SmsManager getSmsManagerForSubId(long subId) {

    public static SmsManager getSmsManagerUsingSubId(long subId) {

        // TODO(shri): Add javadoc link once SubscriptionManager is made public api

        synchronized(sLockObject) {

            SmsManager smsManager = sSubInstances.get(subId);

src/java/com/android/internal/telephony/WapPushOverSms.java

+2 −1
Original line number Diff line number Diff line
@@ -347,7 +347,8 @@ public class WapPushOverSms implements ServiceConnection { 
                case MESSAGE_TYPE_NOTIFICATION_IND: {

                    final NotificationInd nInd = (NotificationInd) pdu;



                    Bundle configs = SmsManager.getSmsManagerForSubId(subId).getCarrierConfigValues();

                    Bundle configs = SmsManager.getSmsManagerUsingSubId(subId)

                            .getCarrierConfigValues();

                    if (configs != null && configs.getBoolean(

                        SmsManager.MMS_CONFIG_APPEND_TRANSACTION_ID, false)) {

                        final byte [] contentLocation = nInd.getContentLocation();