filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Messaging: Remove compatibility for old android versions

Browse Source 
Change-Id: Id9065d60525a509271a0e64c0e349e857cb998e2
This commit is contained in:
Michael W
2024-12-26 14:55:12 +01:00
parent 9bbc7a8f99
commit 7c55a6d56a
104 changed files with 580 additions and 2306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/sms/MmsConfig.java
+11 -18
View File
@@ -25,7 +25,6 @@ import com.android.messaging.Factory;
import com.android.messaging.datamodel.data.ParticipantData;
import com.android.messaging.util.Assert;
import com.android.messaging.util.LogUtil;
import com.android.messaging.util.OsUtil;
import com.android.messaging.util.PhoneUtils;
import com.android.messaging.util.SafeAsyncTask;
import com.google.common.collect.Maps;
@@ -151,27 +150,21 @@ public class MmsConfig {
// Rebuild the entire MmsConfig map.
sSubIdToMmsConfigMap.clear();
loader.reset();
if (OsUtil.isAtLeastL_MR1()) {
final List<SubscriptionInfo> subInfoRecords =
PhoneUtils.getDefault().toLMr1().getActiveSubscriptionInfoList();
if (subInfoRecords == null) {
LogUtil.w(TAG, "Loading mms config failed: no active SIM");
return;
}
for (SubscriptionInfo subInfoRecord : subInfoRecords) {
final int subId = subInfoRecord.getSubscriptionId();
final Bundle values = loader.get(subId);
addMmsConfig(new MmsConfig(subId, values));
}
} else {
final Bundle values = loader.get(ParticipantData.DEFAULT_SELF_SUB_ID);
addMmsConfig(new MmsConfig(ParticipantData.DEFAULT_SELF_SUB_ID, values));
final List<SubscriptionInfo> subInfoRecords =
PhoneUtils.getDefault().getActiveSubscriptionInfoList();
if (subInfoRecords == null) {
LogUtil.w(TAG, "Loading mms config failed: no active SIM");
return;
}
for (SubscriptionInfo subInfoRecord : subInfoRecords) {
final int subId = subInfoRecord.getSubscriptionId();
final Bundle values = loader.get(subId);
addMmsConfig(new MmsConfig(subId, values));
}
}
private static void addMmsConfig(MmsConfig mmsConfig) {
Assert.isTrue(OsUtil.isAtLeastL_MR1() !=
(mmsConfig.mSubId == ParticipantData.DEFAULT_SELF_SUB_ID));
Assert.isTrue(mmsConfig.mSubId != ParticipantData.DEFAULT_SELF_SUB_ID);
sSubIdToMmsConfigMap.put(mmsConfig.mSubId, mmsConfig);
}