filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I861686e60742c88d1cc9dc93c0bdc2d1cc01d862
This commit is contained in:
Treehugger Robot
2020-06-22 17:21:26 +00:00
committed by Automerger Merge Worker
parent 43f98b38f0 d43f2fd23c
commit 945d572d39
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/messaging/datamodel/DataModelImpl.java
+6 -5
View File
@@ -79,11 +79,6 @@ public class DataModelImpl extends DataModel {
mDataModelWorker = new BackgroundWorker(); mDataModelWorker = new BackgroundWorker();
mDatabaseHelper = DatabaseHelper.getInstance(context); mDatabaseHelper = DatabaseHelper.getInstance(context);
mSyncManager = new SyncManager(); mSyncManager = new SyncManager();
if (OsUtil.isAtLeastN()) {
createConnectivityUtilForEachActiveSubscription();
} else {
sConnectivityUtilInstanceCachePreN = new ConnectivityUtil(context);
}
} }
@Override @Override
@@ -219,6 +214,12 @@ public class DataModelImpl extends DataModel {
@Override @Override
public void onApplicationCreated() { public void onApplicationCreated() {
if (OsUtil.isAtLeastN()) {
createConnectivityUtilForEachActiveSubscription();
} else {
sConnectivityUtilInstanceCachePreN = new ConnectivityUtil(mContext);
}
FixupMessageStatusOnStartupAction.fixupMessageStatus(); FixupMessageStatusOnStartupAction.fixupMessageStatus();
ProcessPendingMessagesAction.processFirstPendingMessage(); ProcessPendingMessagesAction.processFirstPendingMessage();
SyncManager.immediateSync(); SyncManager.immediateSync();