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

Commit 32c30564 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Cleaned up the deprecated APIs" into udc-dev

parents fbcc55fd 6c7a6284

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

+4 −9
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ public class ImsManager implements FeatureUpdates { 
    @VisibleForTesting

    public interface SubscriptionManagerProxy {

        boolean isValidSubscriptionId(int subId);

        int[] getSubscriptionIds(int slotIndex);

        int getSubscriptionId(int slotIndex);

        int getDefaultVoicePhoneId();

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

        void setSubscriptionProperty(int subId, String propKey, String propValue);
@@ -296,8 +296,8 @@ public class ImsManager implements FeatureUpdates { 
        }



        @Override

        public int[] getSubscriptionIds(int slotIndex) {

            return getSubscriptionManager().getSubscriptionIds(slotIndex);

        public int getSubscriptionId(int slotIndex) {

            return SubscriptionManager.getSubscriptionId(slotIndex);

        }



        @Override
@@ -1437,12 +1437,7 @@ public class ImsManager implements FeatureUpdates { 
    }



    private int getSubId() {

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

        int subId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

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

            subId = subIds[0];

        }

        return subId;

        return mSubscriptionManagerProxy.getSubscriptionId(mPhoneId);

    }



    private void setWfcModeInternal(int wfcMode) {

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

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


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

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

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

        doReturn(mSubId[0]).when(mSubscriptionManagerProxy).getSubscriptionId(anyInt());

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

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

                anyString(), anyInt());