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

Commit 2c940cca authored by Ling Ma's avatar Ling Ma
Browse files

Gate default with explicit flag 

Without the explicit flag, the updated CTS test need to be CP to android-14-test branch. With the explicit flag, the updated CTS test will take effecr in accordance with the flag in V, and it's a short circuit check in addition to the exitsing path.

Test: data browsing + voice call
Bug: 310519805
Change-Id: I02b5c4ae10f6a2a0ad4052186828a5282f919714
parent c1c8959e

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

+8 −6
Original line number Diff line number Diff line
@@ -2879,6 +2879,7 @@ public class SubscriptionManagerService extends ISub.Stub { 
     * @return The subscription Id default to use.

     */

    private int getDefaultAsUser(@UserIdInt int userId, int defaultValue) {

        if (mFeatureFlags.workProfileApiSplit()) {

            List<SubscriptionInfoInternal> subInfos =

                    getSubscriptionInfoStreamAsUser(UserHandle.of(userId))

                            .filter(SubscriptionInfoInternal::isActive)
@@ -2886,6 +2887,7 @@ public class SubscriptionManagerService extends ISub.Stub { 
            if (subInfos.size() == 1) {

                return subInfos.get(0).getSubscriptionId();

            }

        }

        return defaultValue;

    }