diff options
author | Xin Li <delphij@google.com> | 2024-03-06 09:29:54 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2024-03-06 09:29:54 -0800 |
commit | 7b47743dbace92ff42a24286e0d122978f2f4c46 (patch) | |
tree | df2103cf77f2b278d93091957c1f2d196cf863a6 | |
parent | cf1f78921febe3dfe5224ea643b497bb8edc07a4 (diff) | |
parent | dcfbecc7aa88ea0c890e21762472cdf396212f55 (diff) | |
download | ims-master.tar.gz |
Bug: 319669529
Merged-In: Iaaf63736f57b86d71544a2af3ac1770a9902685a
Change-Id: Ibf39148629a61dd64fda44ccee4afab9784e477e
-rw-r--r-- | rcs/presencepolling/src/com/android/service/ims/presence/PresenceSetting.java | 4 | ||||
-rw-r--r-- | rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/rcs/presencepolling/src/com/android/service/ims/presence/PresenceSetting.java b/rcs/presencepolling/src/com/android/service/ims/presence/PresenceSetting.java index 10988c7..4be5f15 100644 --- a/rcs/presencepolling/src/com/android/service/ims/presence/PresenceSetting.java +++ b/rcs/presencepolling/src/com/android/service/ims/presence/PresenceSetting.java @@ -34,6 +34,7 @@ import android.telephony.SubscriptionManager; import android.telephony.ims.ProvisioningManager; import com.android.ims.internal.Logger; +import com.android.internal.telephony.flags.Flags; import java.util.List; @@ -245,6 +246,9 @@ public class PresenceSetting { public static int getDefaultSubscriptionId() { SubscriptionManager sm = sContext.getSystemService(SubscriptionManager.class); if (sm == null) return SubscriptionManager.INVALID_SUBSCRIPTION_ID; + if (Flags.workProfileApiSplit()) { + sm = sm.createForAllUserProfiles(); + } List<SubscriptionInfo> infos = sm.getActiveSubscriptionInfoList(); if (infos == null || infos.isEmpty()) { // There are no active subscriptions right now. diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java index da4cbd6..839e60f 100644 --- a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java +++ b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java @@ -43,6 +43,7 @@ import android.telephony.ims.feature.MmTelFeature; import android.telephony.ims.stub.ImsRegistrationImplBase; import com.android.ims.internal.Logger; +import com.android.internal.telephony.flags.Flags; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; @@ -360,7 +361,10 @@ public class RcsSettingUtils { public static int getDefaultSubscriptionId(Context context) { SubscriptionManager sm = context.getSystemService(SubscriptionManager.class); if (sm == null) return SubscriptionManager.INVALID_SUBSCRIPTION_ID; - List<SubscriptionInfo> infos = sm.getActiveSubscriptionInfoList(); + if (Flags.workProfileApiSplit()) { + sm = sm.createForAllUserProfiles(); + } + List<SubscriptionInfo> infos = sm.getActiveSubscriptionInfoList(); if (infos == null || infos.isEmpty()) { // There are no active subscriptions right now. return SubscriptionManager.INVALID_SUBSCRIPTION_ID; |