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

Commit ada0cbf7 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Added getAvailableSubscriptionInfoList am: 9fc16190 am: 5eb37a3d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2470138



Change-Id: Idf0b14a5138895f2fdcdb5e171326e3ee5a636ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91a08c62 5eb37a3d

src/java/com/android/internal/telephony/NetworkScanRequestTracker.java

+9 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ import android.telephony.SubscriptionInfo; 
import android.telephony.TelephonyScanManager;

import android.util.Log;



import com.android.internal.telephony.subscription.SubscriptionManagerService;



import java.util.Collection;

import java.util.List;

import java.util.Set;
@@ -195,6 +197,13 @@ public final class NetworkScanRequestTracker { 
    public static Set<String> getAllowedMccMncsForLocationRestrictedScan(Context context) {

        final long token = Binder.clearCallingIdentity();

        try {

            if (PhoneFactory.getDefaultPhone().isSubscriptionManagerServiceEnabled()) {

                return SubscriptionManagerService.getInstance()

                        .getAvailableSubscriptionInfoList(context.getOpPackageName(),

                                context.getAttributionTag()).stream()

                        .flatMap(NetworkScanRequestTracker::getAllowableMccMncsFromSubscriptionInfo)

                        .collect(Collectors.toSet());

            }

            return SubscriptionController.getInstance()

                    .getAvailableSubscriptionInfoList(context.getOpPackageName(),

                            context.getAttributionTag()).stream()

src/java/com/android/internal/telephony/subscription/SubscriptionInfoInternal.java

+7 −0
Original line number Diff line number Diff line
@@ -973,6 +973,13 @@ public class SubscriptionInfoInternal { 
        return mIsGroupDisabled;

    }



    /**

     * @return {@code true} if the subscription is from the actively used SIM.

     */

    public boolean isActive() {

        return mSimSlotIndex >= 0 || mType == SubscriptionManager.SUBSCRIPTION_TYPE_REMOTE_SIM;

    }



    /** @return converted {@link SubscriptionInfo}. */

    @NonNull

    public SubscriptionInfo toSubscriptionInfo() {

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+88 −27
Original line number Diff line number Diff line
@@ -20,10 +20,12 @@ import android.Manifest; 
import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.app.AppOpsManager;

import android.app.compat.CompatChanges;

import android.compat.annotation.ChangeId;

import android.compat.annotation.EnabledSince;

import android.content.Context;

import android.content.pm.PackageManager;

import android.os.Binder;

import android.os.Build;

import android.os.Handler;
@@ -40,6 +42,7 @@ import android.telephony.SubscriptionManager.SubscriptionType; 
import android.telephony.TelephonyFrameworkInitializer;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyRegistryManager;

import android.telephony.euicc.EuiccManager;

import android.text.TextUtils;

import android.util.ArraySet;

import android.util.EventLog;
@@ -53,10 +56,14 @@ import com.android.internal.telephony.MultiSimSettingController; 
import com.android.internal.telephony.TelephonyPermissions;

import com.android.internal.telephony.subscription.SubscriptionDatabaseManager.SubscriptionDatabaseManagerCallback;

import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.telephony.uicc.UiccController;

import com.android.internal.telephony.uicc.UiccSlot;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collections;

import java.util.Comparator;

import java.util.List;
@@ -99,6 +106,12 @@ public class SubscriptionManagerService extends ISub.Stub { 
    /** Subscription manager instance. */

    private final SubscriptionManager mSubscriptionManager;



    /** Euicc manager instance. */

    private final EuiccManager mEuiccManager;



    /** Uicc controller instance. */

    private final UiccController mUiccController;



    /** The main handler of subscription manager service. */

    @NonNull

    private final Handler mHandler;
@@ -252,6 +265,8 @@ public class SubscriptionManagerService extends ISub.Stub { 
        mContext = context;

        mTelephonyManager = context.getSystemService(TelephonyManager.class);

        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);

        mEuiccManager = context.getSystemService(EuiccManager.class);

        mUiccController = UiccController.getInstance();

        mHandler = new Handler(looper);

        TelephonyServiceManager.ServiceRegisterer subscriptionServiceRegisterer =

                TelephonyFrameworkInitializer
@@ -421,6 +436,29 @@ public class SubscriptionManagerService extends ISub.Stub { 
        return result.build();

    }



    /**

     * @return The list of ICCIDs from the inserted physical SIMs.

     */

    @NonNull

    private List<String> getIccIdsOfInsertedPhysicalSims() {

        List<String> iccidList = new ArrayList<>();

        UiccSlot[] uiccSlots = mUiccController.getUiccSlots();

        if (uiccSlots == null) return iccidList;



        for (UiccSlot uiccSlot : uiccSlots) {

            if (uiccSlot != null && uiccSlot.getCardState() != null

                    && uiccSlot.getCardState().isCardPresent() && !uiccSlot.isEuicc()) {

                // Non euicc slots will have single port, so use default port index.

                String iccId = uiccSlot.getIccId(TelephonyManager.DEFAULT_PORT_INDEX);

                if (!TextUtils.isEmpty(iccId)) {

                    iccidList.add(IccUtils.stripTrailingFs(iccId));

                }

            }

        }



        return iccidList;

    }



    /**

     * Set the subscription carrier id.

     *
@@ -477,8 +515,13 @@ public class SubscriptionManagerService extends ISub.Stub { 
     *

     */

    @Override

    @NonNull

    public List<SubscriptionInfo> getAllSubInfoList(@NonNull String callingPackage,

            @Nullable String callingFeatureId) {

        // Verify that the callingPackage belongs to the calling UID

        mContext.getSystemService(AppOpsManager.class)

                .checkPackage(Binder.getCallingUid(), callingPackage);



        // Check if the caller has READ_PHONE_STATE, READ_PRIVILEGED_PHONE_STATE, or carrier

        // privilege on any active subscription. The carrier app will get full subscription infos

        // on the subs it has carrier privilege.
@@ -605,12 +648,41 @@ public class SubscriptionManagerService extends ISub.Stub { 
    }



    /**

     * @see SubscriptionManager#getAvailableSubscriptionInfoList

     * Gets the SubscriptionInfo(s) of all available subscriptions, if any.

     *

     * Available subscriptions include active ones (those with a non-negative

     * {@link SubscriptionInfo#getSimSlotIndex()}) as well as inactive but installed embedded

     * subscriptions.

     */

    @Override

    @NonNull

    public List<SubscriptionInfo> getAvailableSubscriptionInfoList(@NonNull String callingPackage,

            @Nullable String callingFeatureId) {

        return null;

        // Verify that the callingPackage belongs to the calling UID

        mContext.getSystemService(AppOpsManager.class)

                .checkPackage(Binder.getCallingUid(), callingPackage);

        enforcePermissions("getAvailableSubscriptionInfoList",

                Manifest.permission.READ_PRIVILEGED_PHONE_STATE);



        // Now that all security checks pass, perform the operation as ourselves.

        final long identity = Binder.clearCallingIdentity();

        try {

            // Available eSIM profiles are reported by EuiccManager. However for physical SIMs if

            // they are in inactive slot or programmatically disabled, they are still considered

            // available. In this case we get their iccid from slot info and include their

            // subscriptionInfos.

            List<String> iccIds = getIccIdsOfInsertedPhysicalSims();



            return mSubscriptionDatabaseManager.getAllSubscriptions().stream()

                    .filter(subInfo -> subInfo.isActive() || iccIds.contains(subInfo.getIccId())

                            || (mEuiccManager.isEnabled() && subInfo.isEmbedded()))

                    .map(SubscriptionInfoInternal::toSubscriptionInfo)

                    .sorted(Comparator.comparing(SubscriptionInfo::getSimSlotIndex)

                            .thenComparing(SubscriptionInfo::getSubscriptionId))

                    .collect(Collectors.toList());

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }



    /**
@@ -646,7 +718,7 @@ public class SubscriptionManagerService extends ISub.Stub { 
        log("addSubInfo: iccId=" + SubscriptionInfo.givePrintableIccid(iccId) + ", slotIndex="

                + slotIndex + ", displayName=" + displayName + ", type="

                + SubscriptionManager.subscriptionTypeToString(subscriptionType));

        enforceModifyPhoneState("addSubInfo");

        enforcePermissions("addSubInfo", Manifest.permission.MODIFY_PHONE_STATE);



        // Now that all security checks passes, perform the operation as ourselves.

        final long identity = Binder.clearCallingIdentity();
@@ -1127,33 +1199,22 @@ public class SubscriptionManagerService extends ISub.Stub { 
    }



    /**

     * Enforce {@link android.Manifest.permission#MODIFY_PHONE_STATE} permission

     * Enforce callers have any of the provided permissions.

     *

     * @param message Error message included in the exception.

     */

    private void enforceModifyPhoneState(String message) {

        mContext.enforceCallingOrSelfPermission(

                android.Manifest.permission.MODIFY_PHONE_STATE, message);

    }



    /**

     * Enforce {@link android.Manifest.permission#READ_PRIVILEGED_PHONE_STATE} permission

     * @param message Message to include in the exception.

     * @param permissions The permissions to enforce.

     *

     * @param message Error message included in the exception.

     * @throws SecurityException if the caller does not have any permissions.

     */

    private void enforceReadPrivilegedPhoneState(String message) {

        mContext.enforceCallingOrSelfPermission(

                Manifest.permission.READ_PRIVILEGED_PHONE_STATE, message);

    private void enforcePermissions(@Nullable String message, @NonNull String ...permissions) {

        for (String permission : permissions) {

            if (mContext.checkCallingOrSelfPermission(permission)

                    == PackageManager.PERMISSION_GRANTED) {

                return;

            }



    /**

     * Enforce {@link android.Manifest.permission#MANAGE_SUBSCRIPTION_USER_ASSOCIATION} permission

     *

     * @param message Error message included in the exception.

     */

    private void enforceManageSubscriptionUserAssociation(String message) {

        mContext.enforceCallingOrSelfPermission(

                Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION, message);

        }

        throw new SecurityException(message + ". Does not have any of the following permissions. "

                + Arrays.toString(permissions));

    }



    /**

tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java

+2 −0
Original line number Diff line number Diff line
@@ -349,6 +349,8 @@ public class ContextFixture implements TestFixture<Context> { 
                return Context.NETWORK_POLICY_SERVICE;

            } else if (serviceClass == PowerManager.class) {

                return Context.POWER_SERVICE;

            } else if (serviceClass == EuiccManager.class) {

                return Context.EUICC_SERVICE;

            }

            return super.getSystemServiceName(serviceClass);

        }

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionDatabaseManagerTest.java

+13 −3
Original line number Diff line number Diff line
@@ -20,9 +20,11 @@ import static com.google.common.truth.Truth.assertThat; 
import static com.google.common.truth.Truth.assertWithMessage;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doAnswer;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -111,6 +113,7 @@ public class SubscriptionDatabaseManagerTest extends TelephonyTest { 


    static final SubscriptionInfoInternal FAKE_SUBSCRIPTION_INFO1 =

            new SubscriptionInfoInternal.Builder()

                    .setId(1)

                    .setIccId(FAKE_ICCID1)

                    .setSimSlotIndex(0)

                    .setDisplayName(FAKE_CARRIER_NAME1)
@@ -165,6 +168,7 @@ public class SubscriptionDatabaseManagerTest extends TelephonyTest { 


    static final SubscriptionInfoInternal FAKE_SUBSCRIPTION_INFO2 =

            new SubscriptionInfoInternal.Builder()

                    .setId(2)

                    .setIccId(FAKE_ICCID2)

                    .setSimSlotIndex(1)

                    .setDisplayName(FAKE_CARRIER_NAME2)
@@ -364,9 +368,10 @@ public class SubscriptionDatabaseManagerTest extends TelephonyTest { 
     */

    private SubscriptionInfoInternal insertSubscriptionAndVerify(

            @NonNull SubscriptionInfoInternal subInfo) throws Exception {

        assertThat(subInfo.getSubscriptionId()).isEqualTo(

                SubscriptionManager.INVALID_SUBSCRIPTION_ID);

        int subId = mDatabaseManagerUT.insertSubscriptionInfo(subInfo);

        int subId = mDatabaseManagerUT.insertSubscriptionInfo(

                new SubscriptionInfoInternal.Builder(subInfo)

                        .setId(SubscriptionManager.INVALID_SUBSCRIPTION_ID)

                        .build());

        assertThat(SubscriptionManager.isValidSubscriptionId(subId)).isTrue();



        subInfo = new SubscriptionInfoInternal.Builder(subInfo).setId(subId).build();
@@ -414,6 +419,11 @@ public class SubscriptionDatabaseManagerTest extends TelephonyTest { 
        processAllMessages();

        verifySubscription(subInfo);

        verify(mSubscriptionDatabaseManagerCallback, times(2)).onSubscriptionChanged(eq(1));

        Mockito.clearInvocations(mSubscriptionDatabaseManagerCallback);



        // Same sub info again. Should not trigger callback

        mDatabaseManagerUT.updateSubscription(subInfo);

        verify(mSubscriptionDatabaseManagerCallback, never()).onSubscriptionChanged(anyInt());

    }



    @Test