Merge "Fix missing computeIfAbsent() method in L_MR1 and M"

2020-06-17 16:15:32 +00:00
parent c9e85fd21a f0ccb76d8d
commit db1ebc265c
1 changed files with 5 additions and 2 deletions
--- a/src/com/android/messaging/datamodel/DataModelImpl.java
+++ b/src/com/android/messaging/datamodel/DataModelImpl.java
@@ -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));
+                }
            }
        });
    }