commit c48d918afff5fce92d112bc08313c2e4ebc84a3b
author Neil Fuller <nfuller@google.com> Mon Dec 04 14:09:42 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 04 14:09:42 2023 +0000
tree 95d8c1ce3b14044c5ecab3a774bc077f7db0a099
parent dbe09540fd50c0f2706fa2b379e02d11eaf5e610
parent 150c666da26885f7a9b21d47b4650e77b33c0450

Merge "Switch "postsubmit" to "presubmit" after soak" into main

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

diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
index 62cb452..a8d05a3 100644
--- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
+++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
@@ -2879,12 +2879,14 @@
      * @return The subscription Id default to use.
      */
     private int getDefaultAsUser(@UserIdInt int userId, int defaultValue) {
-        List<SubscriptionInfoInternal> subInfos =
-                getSubscriptionInfoStreamAsUser(UserHandle.of(userId))
-                        .filter(SubscriptionInfoInternal::isActive)
-                        .toList();
-        if (subInfos.size() == 1) {
-            return subInfos.get(0).getSubscriptionId();
+        if (mFeatureFlags.workProfileApiSplit()) {
+            List<SubscriptionInfoInternal> subInfos =
+                    getSubscriptionInfoStreamAsUser(UserHandle.of(userId))
+                            .filter(SubscriptionInfoInternal::isActive)
+                            .toList();
+            if (subInfos.size() == 1) {
+                return subInfos.get(0).getSubscriptionId();
+            }
         }
         return defaultValue;
     }