diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-12 23:04:13 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-12 23:04:13 +0000 |
commit | cf784acc43f69d2b455c5de647fcffd59c115b1b (patch) | |
tree | df2103cf77f2b278d93091957c1f2d196cf863a6 | |
parent | 23233b305f24729f8053cb06309c27e799e1104e (diff) | |
parent | 7b47743dbace92ff42a24286e0d122978f2f4c46 (diff) | |
download | ims-sdk-release.tar.gz |
Snap for 11566117 from 7b47743dbace92ff42a24286e0d122978f2f4c46 to sdk-releaseplatform-tools-35.0.1sdk-release
Change-Id: I47c1c8bc1b33716e26e0f0811d5ca0c470be6b82
-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; |