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

Commit 9e480c04 authored by Malcolm Chen's avatar Malcolm Chen Committed by Xiangyu/Malcolm Chen
Browse files

Abstract set APIs in SubscriptionManager 

Put common codes of set APIs in Subscription into an unified method.
So that later it's easier to add APIs.

Bug: 112167869
Test: unittest
Change-Id: Idd2312c98fc178f078c75937ba2d8c2e414f3c3a
parent 1ff73729

telephony/java/android/telephony/SubscriptionManager.java

+39 −69
Original line number Diff line number Diff line
@@ -1051,24 +1051,9 @@ public class SubscriptionManager { 
     */

    public int setIconTint(int tint, int subId) {

        if (VDBG) logd("[setIconTint]+ tint:" + tint + " subId:" + subId);

        if (!isValidSubscriptionId(subId)) {

            logd("[setIconTint]- fail");

            return -1;

        }



        int result = 0;



        try {

            ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));

            if (iSub != null) {

                result = iSub.setIconTint(tint, subId);

            }

        } catch (RemoteException ex) {

            // ignore it

        }



        return result;



        return setSubscriptionPropertyHelper(subId, "setIconTint",

                (iSub)-> iSub.setIconTint(tint, subId)

        );

    }



    /**
@@ -1096,24 +1081,9 @@ public class SubscriptionManager { 
            logd("[setDisplayName]+  displayName:" + displayName + " subId:" + subId

                    + " nameSource:" + nameSource);

        }

        if (!isValidSubscriptionId(subId)) {

            logd("[setDisplayName]- fail");

            return -1;

        }



        int result = 0;



        try {

            ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));

            if (iSub != null) {

                result = iSub.setDisplayNameUsingSrc(displayName, subId, nameSource);

            }

        } catch (RemoteException ex) {

            // ignore it

        }



        return result;



        return setSubscriptionPropertyHelper(subId, "setDisplayName",

                (iSub)-> iSub.setDisplayNameUsingSrc(displayName, subId, nameSource)

        );

    }



    /**
@@ -1124,24 +1094,13 @@ public class SubscriptionManager { 
     * @hide

     */

    public int setDisplayNumber(String number, int subId) {

        if (number == null || !isValidSubscriptionId(subId)) {

        if (number == null) {

            logd("[setDisplayNumber]- fail");

            return -1;

        }



        int result = 0;



        try {

            ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));

            if (iSub != null) {

                result = iSub.setDisplayNumber(number, subId);

            }

        } catch (RemoteException ex) {

            // ignore it

        }



        return result;



        return setSubscriptionPropertyHelper(subId, "setDisplayNumber",

                (iSub)-> iSub.setDisplayNumber(number, subId)

        );

    }



    /**
@@ -1153,23 +1112,9 @@ public class SubscriptionManager { 
     */

    public int setDataRoaming(int roaming, int subId) {

        if (VDBG) logd("[setDataRoaming]+ roaming:" + roaming + " subId:" + subId);

        if (roaming < 0 || !isValidSubscriptionId(subId)) {

            logd("[setDataRoaming]- fail");

            return -1;

        }



        int result = 0;



        try {

            ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));

            if (iSub != null) {

                result = iSub.setDataRoaming(roaming, subId);

            }

        } catch (RemoteException ex) {

            // ignore it

        }



        return result;

        return setSubscriptionPropertyHelper(subId, "setDataRoaming",

                (iSub)->iSub.setDataRoaming(roaming, subId)

        );

    }



    /**
@@ -1994,4 +1939,29 @@ public class SubscriptionManager { 
        }

        return false;

    }



    private interface CallISubMethodHelper {

        int callMethod(ISub iSub) throws RemoteException;

    }



    private int setSubscriptionPropertyHelper(int subId, String methodName,

            CallISubMethodHelper helper) {

        if (!isValidSubscriptionId(subId)) {

            logd("[" + methodName + "]" + "- fail");

            return -1;

        }



        int result = 0;



        try {

            ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub"));

            if (iSub != null) {

                result = helper.callMethod(iSub);

            }

        } catch (RemoteException ex) {

            // ignore it

        }



        return result;

    }

}