diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-08 00:07:04 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-08 00:07:04 +0000 |
commit | 2535052d9d7680cdb05756fb6d63cd8b33288df0 (patch) | |
tree | df2103cf77f2b278d93091957c1f2d196cf863a6 | |
parent | 9823cdb63ae7b2e72d1686dc258e2e55f2851390 (diff) | |
parent | e40c5ebd9cb2c86f161fe88e0fc14b8a13832892 (diff) | |
download | ims-android14-qpr2-s1-release.tar.gz |
Snap for 11192287 from e40c5ebd9cb2c86f161fe88e0fc14b8a13832892 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release
Change-Id: Ie06449de55584fc170d2b5942cdfde44aff3bdf2
-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; |