commit db1ebc265c8eb67d050355d1fdd1dd131ed9b8cc
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 17 16:15:32 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 17 16:15:32 2020 +0000
tree 71b4a283343246e126f62023d801f77ec8c1b2cf
parent c9e85fd21a155b30d0450f86e26a5f4693c0e28a
parent f0ccb76d8d9585846a7f5e7a83520ddcba057b26

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

src/com/android/messaging/datamodel/DataModelImpl.java

diff --git a/src/com/android/messaging/datamodel/DataModelImpl.java b/src/com/android/messaging/datamodel/DataModelImpl.java
index b213162..106bfba 100644
--- a/src/com/android/messaging/datamodel/DataModelImpl.java
+++ b/src/com/android/messaging/datamodel/DataModelImpl.java
@@ -250,8 +250,11 @@
                 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));
+                }
             }
         });
     }