diff options
author | Ling Ma <linggm@google.com> | 2023-12-07 13:45:02 -0800 |
---|---|---|
committer | Ling Ma <linggm@google.com> | 2023-12-07 13:45:02 -0800 |
commit | 2f625059ce181774f1cbfc983453d10d351e0a87 (patch) | |
tree | d08fb2c72478e26d6012603806ec40154e3bfea1 | |
parent | d6eb451285e86071204324b73ec4fbd6339bdb8f (diff) | |
download | Mms-2f625059ce181774f1cbfc983453d10d351e0a87.tar.gz |
Wrap subManager creation with createForAllProfiles
Since U, a sub can be associated to a particular profile, and thus in V we enforce filtering on caller and only show the subs that are associated with the caller.
However, in some cases the caller indeed needs to see all subs regardless its association, e.g. sysUI. Therefore, a param isForAllProfile is added to indicate whether the caller intends to see all subs.
Bug: 296076674
Test: m bluejay-trunk_staging-userdebug
Flag: ACONFIG com.android.internal.telephony.flags.work_profile_api_split DEVELOPMENT
Change-Id: I0f15493f505c4cb99f829e9d6765a2a9eb152e44
-rw-r--r-- | src/com/android/mms/service/MmsConfigManager.java | 5 | ||||
-rw-r--r-- | src/com/android/mms/service/metrics/MmsStats.java | 5 |
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); } |