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

Fix creating ConnectivityUtil to work on any platform am: dcfe928ff3 am: 86314ff8e6 am: d810c8b49e am: d5a77b3938

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

Change-Id: I4801c9d21ff246d6de3f16842ed3caa4421dc2ca
This commit is contained in:
Taesu Lee
2020-06-18 18:10:41 +00:00
committed by Automerger Merge Worker
parent bac9c313a7 d5a77b3938
commit 148742e0ad
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,11 +66,11 @@ public class DataModelImpl extends DataModel {
private final DatabaseHelper mDatabaseHelper;
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
// Cached ConnectivityUtil instance for Pre-N.
private static ConnectivityUtil sConnectivityUtilInstanceCachePreN = null;
// Cached ConnectivityUtil subId->instance for N and beyond
private static final ConcurrentHashMap<Integer, ConnectivityUtil>
sConnectivityUtilInstanceCacheLMR1 = new ConcurrentHashMap<>();
sConnectivityUtilInstanceCacheN = new ConcurrentHashMap<>();
public DataModelImpl(final Context context) {
super();
@@ -79,10 +79,10 @@ public class DataModelImpl extends DataModel {
mDataModelWorker = new BackgroundWorker();
mDatabaseHelper = DatabaseHelper.getInstance(context);
mSyncManager = new SyncManager();
if (OsUtil.isAtLeastL_MR1()) {
createConnectivityUtilForLMR1();
if (OsUtil.isAtLeastN()) {
createConnectivityUtilForEachActiveSubscription();
} else {
sConnectivityUtilInstanceCachePreLMR1 = new ConnectivityUtil(context);
sConnectivityUtilInstanceCachePreN = new ConnectivityUtil(context);
}
}
@@ -236,13 +236,15 @@ public class DataModelImpl extends DataModel {
// gracefully
MmsConfig.loadAsync();
ParticipantRefresh.refreshSelfParticipants();
createConnectivityUtilForLMR1();
if (OsUtil.isAtLeastN()) {
createConnectivityUtilForEachActiveSubscription();
}
}
});
}
}
private void createConnectivityUtilForLMR1() {
private void createConnectivityUtilForEachActiveSubscription() {
PhoneUtils.forEachActiveSubscription(new PhoneUtils.SubscriptionRunnable() {
@Override
public void runForSubscription(int subId) {
@@ -250,20 +252,17 @@ public class DataModelImpl extends DataModel {
if (subId <= ParticipantData.DEFAULT_SELF_SUB_ID) {
subId = PhoneUtils.getDefault().getDefaultSmsSubscriptionId();
}
if (!sConnectivityUtilInstanceCacheLMR1.containsKey(subId)) {
sConnectivityUtilInstanceCacheLMR1.put(
subId, new ConnectivityUtil(mContext, subId));
}
sConnectivityUtilInstanceCacheN.computeIfAbsent(
subId, key -> new ConnectivityUtil(mContext, key));
}
});
}
public static ConnectivityUtil getConnectivityUtil(final int subId) {
if (OsUtil.isAtLeastL_MR1()) {
return sConnectivityUtilInstanceCacheLMR1.get(subId);
if (OsUtil.isAtLeastN()) {
return sConnectivityUtilInstanceCacheN.get(subId);
} else {
return sConnectivityUtilInstanceCachePreLMR1;
return sConnectivityUtilInstanceCachePreN;
}
}
}

11
src/com/android/messaging/util/ConnectivityUtil.java
View File

@@ -23,6 +23,16 @@ import android.telephony.TelephonyManager;
import com.android.messaging.datamodel.data.ParticipantData;
/**
* ConnectivityUtil listens to the network service state changes.
*
* On N and beyond, This class instance can be created via ConnectivityUtil(context, subId), use
* ConnectivityUtil(context) for others.
*
* Note that TelephonyManager has createForSubscriptionId() for a specific subId from N but listen()
* does not use the subId on the manager, and uses the default subId on PhoneStateListener. From O,
* the manager uses its' own subId in listen().
*/
public class ConnectivityUtil {
// Assume not connected until informed differently
private volatile int mCurrentServiceState = ServiceState.STATE_POWER_OFF;
@@ -40,6 +50,7 @@ public class ConnectivityUtil {
}
public ConnectivityUtil(final Context context, final int subId) {
Assert.isTrue(OsUtil.isAtLeastN());
mTelephonyManager =
((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE))
.createForSubscriptionId(subId);