diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-09 00:07:11 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-09 00:07:11 +0000 |
| commit | b4d9370f44dd08d06dfc49d6f0824378bf57e770 (patch) | |
| tree | a1a9b777034cd94a94eb2b06bd54006b0dab8aba | |
| parent | 1baf16b3fa02073f87ad46bba4aeafc718e99b11 (diff) | |
| parent | 7f043b2398cfc4763b71854b517b88187778939c (diff) | |
| download | ims-b4d9370f44dd08d06dfc49d6f0824378bf57e770.tar.gz | |
Snap for 11426397 from 7f043b2398cfc4763b71854b517b88187778939c to 24Q2-release
Change-Id: Iaa19ce90099f5fad301099d1fe13a43d90cb433e
3 files changed, 5 insertions, 6 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 4be5f15..2492b51 100644 --- a/rcs/presencepolling/src/com/android/service/ims/presence/PresenceSetting.java +++ b/rcs/presencepolling/src/com/android/service/ims/presence/PresenceSetting.java @@ -246,9 +246,8 @@ 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(); - } + 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/AndroidManifest.xml b/rcs/rcsservice/AndroidManifest.xml index 6d108a1..0afd899 100644 --- a/rcs/rcsservice/AndroidManifest.xml +++ b/rcs/rcsservice/AndroidManifest.xml @@ -53,6 +53,7 @@ <uses-permission android:name="android.permission.ACCESS_UCE_PRESENCE_SERVICE"/> <uses-permission android:name="com.android.ims.permission.PRESENCE_ACCESS"/> <uses-permission android:name="com.android.rcs.eab.permission.READ_WRITE_EAB"/> + <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/> <application android:name="RcsServiceApp" android:persistent="true" diff --git a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java index 839e60f..4f2ae48 100644 --- a/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java +++ b/rcs/rcsservice/src/com/android/service/ims/RcsSettingUtils.java @@ -361,9 +361,8 @@ public class RcsSettingUtils { public static int getDefaultSubscriptionId(Context context) { SubscriptionManager sm = context.getSystemService(SubscriptionManager.class); if (sm == null) return SubscriptionManager.INVALID_SUBSCRIPTION_ID; - if (Flags.workProfileApiSplit()) { - sm = sm.createForAllUserProfiles(); - } + sm = sm.createForAllUserProfiles(); + List<SubscriptionInfo> infos = sm.getActiveSubscriptionInfoList(); if (infos == null || infos.isEmpty()) { // There are no active subscriptions right now. |