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

ProcessPendingMessagesAction works based on subscriptions

Browse Source 
PorcessPendingMessagesAction queues one message for sending/downloading
associated with a subscription triggering current action at a time. And
the ConnectivityUtil also works based on subscriptions so that pending
messages can be processed regardless of other phones' state in multi-sim
case.

It includes cleanup code as well.

Test: Manual

Change-Id: Id6b4f4a0aa6a3291e7a4d8a5d3f0fbb9db3c5b86
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
This commit is contained in:
Taesu Lee
2020-02-17 15:15:17 +09:00
parent 4e84ad49bb
commit 4e99cc0a02
21 changed files with 274 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/android/messaging/datamodel/DataModelImpl.java
View File

@@ -57,22 +57,33 @@ import com.android.messaging.util.LogUtil;
import com.android.messaging.util.OsUtil;
import com.android.messaging.util.PhoneUtils;
import java.util.concurrent.ConcurrentHashMap;
public class DataModelImpl extends DataModel {
private final Context mContext;
private final ActionService mActionService;
private final BackgroundWorker mDataModelWorker;
private final DatabaseHelper mDatabaseHelper;
private final ConnectivityUtil mConnectivityUtil;
private final SyncManager mSyncManager;
// Cached ConnectivityUtil instance for Pre-L_MR1
private static ConnectivityUtil sConnectivityUtilInstanceCachePreLMR1 = null;
// Cached ConnectivityUtil subId->instance for L_MR1 and beyond
private static final ConcurrentHashMap<Integer, ConnectivityUtil>
sConnectivityUtilInstanceCacheLMR1 = new ConcurrentHashMap<>();
public DataModelImpl(final Context context) {
super();
mContext = context;
mActionService = new ActionService();
mDataModelWorker = new BackgroundWorker();
mDatabaseHelper = DatabaseHelper.getInstance(context);
mConnectivityUtil = new ConnectivityUtil(context);
mSyncManager = new SyncManager();
if (OsUtil.isAtLeastL_MR1()) {
createConnectivityUtilForLMR1();
} else {
sConnectivityUtilInstanceCachePreLMR1 = new ConnectivityUtil(context);
}
}
@Override
@@ -184,11 +195,6 @@ public class DataModelImpl extends DataModel {
return mDatabaseHelper.getDatabase();
}
@Override
public ConnectivityUtil getConnectivityUtil() {
return mConnectivityUtil;
}
@Override
public SyncManager getSyncManager() {
return mSyncManager;
@@ -218,7 +224,8 @@ public class DataModelImpl extends DataModel {
SyncManager.immediateSync();
if (OsUtil.isAtLeastL_MR1()) {
// Start listening for subscription change events for refreshing self participants.
// Start listening for subscription change events for refreshing any data associated
// with subscriptions.
PhoneUtils.getDefault().toLMr1().registerOnSubscriptionsChangedListener(
new SubscriptionManager.OnSubscriptionsChangedListener() {
@Override
@@ -229,8 +236,31 @@ public class DataModelImpl extends DataModel {
// gracefully
MmsConfig.loadAsync();
ParticipantRefresh.refreshSelfParticipants();
createConnectivityUtilForLMR1();
}
});
}
}
private void createConnectivityUtilForLMR1() {
PhoneUtils.forEachActiveSubscription(new PhoneUtils.SubscriptionRunnable() {
@Override
public void runForSubscription(int subId) {
// Create the ConnectivityUtil instance for given subId if absent.
if (subId <= ParticipantData.DEFAULT_SELF_SUB_ID) {
subId = PhoneUtils.getDefault().getDefaultSmsSubscriptionId();
}
sConnectivityUtilInstanceCacheLMR1.computeIfAbsent(
subId, key -> new ConnectivityUtil(mContext, key));
}
});
}
public static ConnectivityUtil getConnectivityUtil(final int subId) {
if (OsUtil.isAtLeastL_MR1()) {
return sConnectivityUtilInstanceCacheLMR1.get(subId);
} else {
return sConnectivityUtilInstanceCachePreLMR1;
}
}
}