commit d43f2fd23c8cb1fa129369af46fa45fa939d5290
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 22 17:06:51 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 22 17:06:51 2020 +0000
tree 08864aa2229962259ea4155327152eb103a0b9bf
parent 5c393695c6a709e2a812d480e45a0ce749956381
parent 92b38533ec681aa4de4d2bdf0cc8e7fcdfd2a70e

Merge "Fix SecurityException at getActiveSubscriptionInfoList() on N and O" am: be4c269813 am: 92b38533ec

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

Change-Id: I32963ac99c68803399349b0c4e1f54b9621ba76c

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 bbb695b..ddb17ff 100644
--- a/src/com/android/messaging/datamodel/DataModelImpl.java
+++ b/src/com/android/messaging/datamodel/DataModelImpl.java
@@ -79,11 +79,6 @@
         mDataModelWorker = new BackgroundWorker();
         mDatabaseHelper = DatabaseHelper.getInstance(context);
         mSyncManager = new SyncManager();
-        if (OsUtil.isAtLeastN()) {
-            createConnectivityUtilForEachActiveSubscription();
-        } else {
-            sConnectivityUtilInstanceCachePreN = new ConnectivityUtil(context);
-        }
     }
 
     @Override
@@ -219,6 +214,12 @@
 
     @Override
     public void onApplicationCreated() {
+        if (OsUtil.isAtLeastN()) {
+            createConnectivityUtilForEachActiveSubscription();
+        } else {
+            sConnectivityUtilInstanceCachePreN = new ConnectivityUtil(mContext);
+        }
+
         FixupMessageStatusOnStartupAction.fixupMessageStatus();
         ProcessPendingMessagesAction.processFirstPendingMessage();
         SyncManager.immediateSync();