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

Commit dbe09540 authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Gate default with explicit flag" into main

parents 0b06f564 2c940cca

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;

    }