commit feaad2df13582c18e0947383b806d18d1ac238da
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 17 16:22:59 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 17 16:22:59 2020 +0000
tree 71b4a283343246e126f62023d801f77ec8c1b2cf
parent b9dd11dd7708f54d138d82da85498e6eb9e56eff
parent db1ebc265c8eb67d050355d1fdd1dd131ed9b8cc

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

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1341554

Change-Id: I4bdfca1d8b537b3940eec4ecf1a166b78589b2db

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));
+                }
             }
         });
     }