Merge "Fix missing computeIfAbsent() method in L_MR1 and M" am: db1ebc265c am: feaad2df13 am: 69cd91a75f am: db44cbe6db am: bac9c313a7

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1341554 Change-Id: Ic1d6d6c1bcdb12356d6a0bb1dbca598c80a84cee
2020-06-17 17:21:15 +00:00
parent 9f2b2181a1 bac9c313a7
commit a110636d6f
1 changed files with 5 additions and 2 deletions
@@ -250,8 +250,11 @@ public class DataModelImpl extends DataModel {
                if (subId <= ParticipantData.DEFAULT_SELF_SUB_ID) {
                    subId = PhoneUtils.getDefault().getDefaultSmsSubscriptionId();
                }
-                sConnectivityUtilInstanceCacheLMR1.computeIfAbsent(
-                        subId, key -> new ConnectivityUtil(mContext, key));
+
+                if (!sConnectivityUtilInstanceCacheLMR1.containsKey(subId)) {
+                    sConnectivityUtilInstanceCacheLMR1.put(
+                            subId, new ConnectivityUtil(mContext, subId));
+                }
            }
        });
    }