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

Commit 5d9283f4 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge changes from topic "getSubscriptionId" 

* changes:
  Notify subscription info changed
  Add getSubscriptionId API
parents ca549020 74eaf2cc

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

+6 −8
Original line number Diff line number Diff line
@@ -439,14 +439,12 @@ public class MultiSimSettingController extends Handler { 
        // being specified in it. So here we do additional check to make sur we don't miss the

        // subId.

        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            int[] subIds = mSubController.getSubIds(phoneId);

            if (!ArrayUtils.isEmpty(subIds)) {

                CarrierConfigManager cm = (CarrierConfigManager) mContext.getSystemService(

                        mContext.CARRIER_CONFIG_SERVICE);

                if (cm != null && cm.getConfigForSubId(subIds[0]) != null) {

                    loge("onCarrierConfigChanged with invalid subId while subd "

                            + subIds[0] + " is active and its config is loaded");

                    subId = subIds[0];

            subId = mSubController.getSubId(phoneId);

            if (SubscriptionManager.isValidSubscriptionId(subId)) {

                CarrierConfigManager cm = mContext.getSystemService(CarrierConfigManager.class);

                if (cm != null && cm.getConfigForSubId(subId) != null) {

                    loge("onCarrierConfigChanged with invalid subId while subId "

                            + subId + " is active and its config is loaded");

                }

            }

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ public class PhoneFactory { 
                if (sContext.getResources().getBoolean(

                        com.android.internal.R.bool.config_using_subscription_manager_service)) {

                    Rlog.i(LOG_TAG, "Creating SubscriptionManagerService");

                    sSubscriptionManagerService = new SubscriptionManagerService(context);

                    sSubscriptionManagerService = new SubscriptionManagerService(context,

                            Looper.myLooper());

                } else {

                    Rlog.i(LOG_TAG, "Creating SubscriptionController");

                    TelephonyComponentFactory.getInstance().inject(SubscriptionController.class

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

+3 −4
Original line number Diff line number Diff line
@@ -2532,10 +2532,9 @@ public class RadioResponse extends IRadioResponse.Stub { 
            ArrayList<NeighboringCellInfo> ret = new ArrayList<NeighboringCellInfo>();

            NeighboringCellInfo cell;



            int[] subId = SubscriptionManager.getSubId(mRil.mPhoneId);

            int radioType =

                    ((TelephonyManager) mRil.mContext.getSystemService(

                            Context.TELEPHONY_SERVICE)).getDataNetworkType(subId[0]);

            int radioType = ((TelephonyManager) mRil.mContext.getSystemService(

                    Context.TELEPHONY_SERVICE)).getDataNetworkType(

                            SubscriptionManager.getSubscriptionId(mRil.mPhoneId));



            if (radioType != TelephonyManager.NETWORK_TYPE_UNKNOWN) {

                for (int i = 0; i < cells.size(); i++) {

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

+4 −3
Original line number Diff line number Diff line
@@ -245,9 +245,10 @@ public class WapPushOverSms implements ServiceConnection { 
                System.arraycopy(pdu, dataIndex, intentData, 0, intentData.length);

            }



            int[] subIds = SubscriptionManager.getSubId(phoneId);

            int subId = (subIds != null) && (subIds.length > 0) ? subIds[0]

                    : SmsManager.getDefaultSmsSubscriptionId();

            int subId = SubscriptionManager.getSubscriptionId(phoneId);

            if (!SubscriptionManager.isValidSubscriptionId(subId)) {

                subId = SmsManager.getDefaultSmsSubscriptionId();

            }



            // Continue if PDU parsing fails: the default messaging app may successfully parse the

            // same PDU.

src/java/com/android/internal/telephony/ims/ImsResolver.java

+3 −7
Original line number Diff line number Diff line
@@ -312,7 +312,8 @@ public class ImsResolver implements ImsServiceController.ImsServiceControllerCal 
    @VisibleForTesting

    public interface SubscriptionManagerProxy {

        /**

         * Mock-able interface for {@link SubscriptionManager#getSubId(int)} used for testing.

         * Mock-able interface for {@link SubscriptionManager#getSubscriptionId(int)} used for

         * testing.

         */

        int getSubId(int slotId);

        /**
@@ -346,12 +347,7 @@ public class ImsResolver implements ImsServiceController.ImsServiceControllerCal 
    private SubscriptionManagerProxy mSubscriptionManagerProxy = new SubscriptionManagerProxy() {

        @Override

        public int getSubId(int slotId) {

            int[] subIds = SubscriptionManager.getSubId(slotId);

            if (subIds != null) {

                // This is done in all other places getSubId is used.

                return subIds[0];

            }

            return SubscriptionManager.INVALID_SUBSCRIPTION_ID;

            return SubscriptionManager.getSubscriptionId(slotId);

        }



        @Override