commit d626bcaf0ccfe8847596be7653feb63a326e618b
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 19 16:55:25 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 19 16:55:25 2020 +0000
tree 5aacd729901a024d57a45d37dbf8dc00778f4556
parent 0c7ab8c20a2d00ee14e69afc6ffa40d707e14ea4
parent bd3b711acafc8bc28827b95ebc2e6fed023f7fc1

Merge "Fix handling format based on API level accordingly."

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 5d2217d..bbb695b 100644
--- a/src/com/android/messaging/datamodel/DataModelImpl.java
+++ b/src/com/android/messaging/datamodel/DataModelImpl.java
@@ -252,8 +252,10 @@
                 if (subId <= ParticipantData.DEFAULT_SELF_SUB_ID) {
                     subId = PhoneUtils.getDefault().getDefaultSmsSubscriptionId();
                 }
-                sConnectivityUtilInstanceCacheN.computeIfAbsent(
-                        subId, key -> new ConnectivityUtil(mContext, key));
+                if (!sConnectivityUtilInstanceCacheN.containsKey(subId)) {
+                    sConnectivityUtilInstanceCacheN.put(
+                            subId, new ConnectivityUtil(mContext, subId));
+                }
             }
         });
     }