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

Commit b87ac1c4 authored by Peter Wang's avatar Peter Wang Committed by Automerger Merge Worker
Browse files

Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and... 

Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" into rvc-dev am: d9773f2c am: ee1576b3 am: 5c216e42

Change-Id: I6987c72458c99e4e2e6a59c7295a741cd23548b6
parents df0414df 5c216e42

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -11292,10 +11292,10 @@ package android.telephony { 
  public class SubscriptionManager {

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription();

    method public boolean canManageSubscription(@NonNull android.telephony.SubscriptionInfo, @NonNull String);

    method @NonNull public int[] getActiveAndHiddenSubscriptionIdList();

    method @NonNull public int[] getActiveSubscriptionIdList();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getActiveSubscriptionIdList();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForIcc(@NonNull String);

    method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getCompleteActiveSubscriptionIdList();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int);

    method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isSubscriptionEnabled(int);

services/core/java/com/android/server/TelephonyRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -1393,7 +1393,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    public void notifyCarrierNetworkChange(boolean active) {

        // only CarrierService with carrier privilege rule should have the permission

        int[] subIds = Arrays.stream(SubscriptionManager.from(mContext)

                    .getActiveAndHiddenSubscriptionIdList())

                    .getCompleteActiveSubscriptionIdList())

                    .filter(i -> TelephonyPermissions.checkCarrierPrivilegeForSubId(mContext,

                            i)).toArray();

        if (ArrayUtils.isEmpty(subIds)) {

telephony/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -691,10 +691,10 @@ package android.telephony { 
  public class SubscriptionManager {

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription();

    method public boolean canManageSubscription(@NonNull android.telephony.SubscriptionInfo, @NonNull String);

    method @NonNull public int[] getActiveAndHiddenSubscriptionIdList();

    method @NonNull public int[] getActiveSubscriptionIdList();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getActiveSubscriptionIdList();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForIcc(@NonNull String);

    method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList();

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int[] getCompleteActiveSubscriptionIdList();

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int);

    method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int);

    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean isSubscriptionEnabled(int);

telephony/common/com/android/internal/telephony/TelephonyPermissions.java

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ public final class TelephonyPermissions { 
    private static boolean checkCarrierPrivilegeForAnySubId(Context context, int uid) {

        SubscriptionManager sm = (SubscriptionManager) context.getSystemService(

                Context.TELEPHONY_SUBSCRIPTION_SERVICE);

        int[] activeSubIds = sm.getActiveAndHiddenSubscriptionIdList();

        int[] activeSubIds = sm.getCompleteActiveSubscriptionIdList();

        for (int activeSubId : activeSubIds) {

            if (getCarrierPrivilegeStatus(context, activeSubId, uid)

                    == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {

telephony/java/android/telephony/SubscriptionManager.java

+3 −1
Original line number Diff line number Diff line
@@ -2157,6 +2157,7 @@ public class SubscriptionManager { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public @NonNull int[] getActiveSubscriptionIdList() {

        return getActiveSubscriptionIdList(/* visibleOnly */ true);

    }
@@ -2174,7 +2175,8 @@ public class SubscriptionManager { 
     * @hide

     */

    @SystemApi

    public @NonNull int[] getActiveAndHiddenSubscriptionIdList() {

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public @NonNull int[] getCompleteActiveSubscriptionIdList() {

        return getActiveSubscriptionIdList(/* visibleOnly */false);

    }