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

Commit 0dabb66f authored by Brad Ebinger's avatar Brad Ebinger Committed by Presubmit Automerger Backend
Browse files

[automerge] Partial Revert of subId changes in ImsManager 2p: 10fa560e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/16981688

Bug: 217748245
Change-Id: I5eb22212e7b4ecff53c25216f3883bf4740e3808
parents 3fc2b738 10fa560e

src/java/com/android/ims/ImsManager.java

+19 −5
Original line number Original line Diff line number Diff line
@@ -255,6 +255,7 @@ public class ImsManager implements FeatureUpdates { 
    @VisibleForTesting

    @VisibleForTesting

    public interface SubscriptionManagerProxy {

    public interface SubscriptionManagerProxy {

        boolean isValidSubscriptionId(int subId);

        boolean isValidSubscriptionId(int subId);

        int[] getSubscriptionIds(int slotIndex);

        int getDefaultVoicePhoneId();

        int getDefaultVoicePhoneId();

        int getIntegerSubscriptionProperty(int subId, String propKey, int defValue);

        int getIntegerSubscriptionProperty(int subId, String propKey, int defValue);

        void setSubscriptionProperty(int subId, String propKey, String propValue);

        void setSubscriptionProperty(int subId, String propKey, String propValue);
@@ -288,6 +289,11 @@ public class ImsManager implements FeatureUpdates { 
            return SubscriptionManager.isValidSubscriptionId(subId);

            return SubscriptionManager.isValidSubscriptionId(subId);

        }

        }





        @Override

        public int[] getSubscriptionIds(int slotIndex) {

            return getSubscriptionManager().getSubscriptionIds(slotIndex);

        }



        @Override

        @Override

        public int getDefaultVoicePhoneId() {

        public int getDefaultVoicePhoneId() {

            return SubscriptionManager.getDefaultVoicePhoneId();

            return SubscriptionManager.getDefaultVoicePhoneId();
@@ -1405,11 +1411,13 @@ public class ImsManager implements FeatureUpdates { 
        }

        }

    }

    }





    /**

    private int getSubId() {

     * @return the subscription ID currently associated with this ImsManager instance.

        int[] subIds = mSubscriptionManagerProxy.getSubscriptionIds(mPhoneId);

     */

        int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

    public int getSubId() {

        if (subIds != null && subIds.length >= 1) {

        return mMmTelConnectionRef.get().getSubId();

            subId = subIds[0];

        }

        return subId;

    }

    }





    private void setWfcModeInternal(int wfcMode) {

    private void setWfcModeInternal(int wfcMode) {
@@ -2777,6 +2785,12 @@ public class ImsManager implements FeatureUpdates { 
            throw new ImsException("Service is unavailable",

            throw new ImsException("Service is unavailable",

                    ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);

                    ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);

        }

        }

        if (getSubId() != c.getSubId()) {

            logi("Trying to get MmTelFeature when it is still setting up, curr subId=" + getSubId()

                    + ", target subId=" + c.getSubId());

            throw new ImsException("Service is still initializing",

                    ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);

        }

        return c;

        return c;

    }

    }

tests/src/com/android/ims/ImsManagerTest.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -108,6 +108,7 @@ public class ImsManagerTest extends ImsTestBase { 




        doReturn(true).when(mSubscriptionManagerProxy).isValidSubscriptionId(anyInt());

        doReturn(true).when(mSubscriptionManagerProxy).isValidSubscriptionId(anyInt());

        doReturn(mSubId).when(mSubscriptionManagerProxy).getActiveSubscriptionIdList();

        doReturn(mSubId).when(mSubscriptionManagerProxy).getActiveSubscriptionIdList();

        doReturn(mSubId).when(mSubscriptionManagerProxy).getSubscriptionIds(anyInt());

        doReturn(mPhoneId).when(mSubscriptionManagerProxy).getDefaultVoicePhoneId();

        doReturn(mPhoneId).when(mSubscriptionManagerProxy).getDefaultVoicePhoneId();

        doReturn(-1).when(mSubscriptionManagerProxy).getIntegerSubscriptionProperty(anyInt(),

        doReturn(-1).when(mSubscriptionManagerProxy).getIntegerSubscriptionProperty(anyInt(),

                anyString(), anyInt());

                anyString(), anyInt());