Snap for 11200327 from 2f625059ce181774f1cbfc983453d10d351e0a87 to 24Q1-releaseandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-release

Change-Id: I602c7b88de3903657fea8e23938a66477885aea7

2 files changed, 9 insertions, 1 deletions

diff --git a/src/com/android/mms/service/MmsConfigManager.java b/src/com/android/mms/service/MmsConfigManager.java
index 3606ed8..ce27d9f 100644
--- a/src/com/android/mms/service/MmsConfigManager.java
+++ b/src/com/android/mms/service/MmsConfigManager.java
@@ -27,6 +27,8 @@ import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.util.ArrayMap;
 
+import com.android.internal.telephony.flags.Flags;
+
 import java.util.List;
 import java.util.Map;
 
@@ -60,6 +62,9 @@ public class MmsConfigManager {
     public void init(final Context context) {
         mContext = context;
         mSubscriptionManager = SubscriptionManager.from(context);
+        if (Flags.workProfileApiSplit()) {
+            mSubscriptionManager = mSubscriptionManager.createForAllUserProfiles();
+        }
         context.registerReceiver(
                 mReceiver, new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
         LogUtil.i("MmsConfigManager loads mms config in init()");
diff --git a/src/com/android/mms/service/metrics/MmsStats.java b/src/com/android/mms/service/metrics/MmsStats.java
index 7e98b0b..fd45a5d 100644
--- a/src/com/android/mms/service/metrics/MmsStats.java
+++ b/src/com/android/mms/service/metrics/MmsStats.java
@@ -35,6 +35,7 @@ import android.telephony.TelephonyManager;
 import android.telephony.UiccCardInfo;
 
 import com.android.internal.telephony.SmsApplication;
+import com.android.internal.telephony.flags.Flags;
 import com.android.mms.IncomingMms;
 import com.android.mms.OutgoingMms;
 
@@ -190,7 +191,9 @@ public class MmsStats {
         if(subManager == null) {
             return false;
         }
-
+        if (Flags.workProfileApiSplit()) {
+            subManager = subManager.createForAllUserProfiles();
+        }
         List<SubscriptionInfo> activeSubscriptionInfo = subManager.getActiveSubscriptionInfoList();
         return (activeSubscriptionInfo.size() > 1);
     }