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

Commit ec149463 authored by sqian's avatar sqian
Browse files

Make SubscriptionManager.isActiveSubId public 

Rename subId to subscriptionId

Bug: 113072551
Test: Treehugger
Change-Id: I6f7e0d06a2ad2367dad04723fea808cad8f9597a
parent 26e686a9

api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -42456,6 +42456,7 @@ package android.telephony { 
    method public static int getDefaultVoiceSubscriptionId();

    method public static int getDefaultVoiceSubscriptionId();

    method public static int[] getSubscriptionIds(int);

    method public static int[] getSubscriptionIds(int);

    method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);

    method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);

    method public boolean isActiveSubscriptionId(int);

    method public boolean isNetworkRoaming(int);

    method public boolean isNetworkRoaming(int);

    method public void removeOnOpportunisticSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);

    method public void removeOnOpportunisticSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);

    method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);

    method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);

telephony/java/android/telephony/SubscriptionManager.java

+14 −1
Original line number Original line Diff line number Diff line
@@ -1825,6 +1825,19 @@ public class SubscriptionManager { 
        return new Resources(context.getResources().getAssets(), newMetrics, newConfig);

        return new Resources(context.getResources().getAssets(), newMetrics, newConfig);

    }

    }





    /**

     * Checks if the supplied subscription ID corresponds to an active subscription.

     *

     * @param subscriptionId the subscription ID.

     * @return {@code true} if the supplied subscription ID corresponds to an active subscription;

     * {@code false} if it does not correspond to an active subscription; or throw a

     * SecurityException if the caller hasn't got the right permission.

     */

    @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE)

    public boolean isActiveSubscriptionId(int subscriptionId) {

        return isActiveSubId(subscriptionId);

    }



    /**

    /**

     * @return true if the sub ID is active. i.e. The sub ID corresponds to a known subscription

     * @return true if the sub ID is active. i.e. The sub ID corresponds to a known subscription

     * and the SIM providing the subscription is present in a slot and in "LOADED" state.

     * and the SIM providing the subscription is present in a slot and in "LOADED" state.
@@ -1835,7 +1848,7 @@ public class SubscriptionManager { 
        try {

        try {

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

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

            if (iSub != null) {

            if (iSub != null) {

                return iSub.isActiveSubId(subId);

                return iSub.isActiveSubId(subId, mContext.getOpPackageName());

            }

            }

        } catch (RemoteException ex) {

        } catch (RemoteException ex) {

        }

        }

telephony/java/com/android/internal/telephony/ISub.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -232,5 +232,5 @@ interface ISub { 
     */

     */

    int getSimStateForSlotIndex(int slotIndex);

    int getSimStateForSlotIndex(int slotIndex);





    boolean isActiveSubId(int subId);

    boolean isActiveSubId(int subId, String callingPackage);

}
 
}