commit 69cd91a75f6f8c1713c7a714802b229d43b48ddc
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 17 16:35:40 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jun 17 16:35:40 2020 +0000
tree e4da68f37d4ba3cfdb70eecd87a6bcd9b94677f6
parent 742b382d83f0c3c03bcb18197e940158237b7be4
parent feaad2df13582c18e0947383b806d18d1ac238da

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

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

Change-Id: Iaccb9a0bfe078bb3712c875e30877bd2e0bdf1d2

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