Fix a race condition for data change notification am: f3f045b284

Original change: undetermined

Change-Id: I1d8029d3ab2da8172600e057c577f20ab74988e5
This commit is contained in:
Robert Greenwalt
2021-05-31 03:33:04 +00:00
committed by Automerger Merge Worker

View File

@@ -357,6 +357,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
for (int t=0; t <= ConnectivityManager.MAX_RADIO_TYPE; t++) {
if (t != mNetworkPreference &&
mNetTrackers[t].getNetworkInfo().isConnected()) {
if (DBG) {
Log.d(TAG, "tearing down " +
mNetTrackers[t].getNetworkInfo() +
" in enforcePreference");
}
teardown(mNetTrackers[t]);
}
}
@@ -1232,6 +1237,10 @@ public class ConnectivityService extends IConnectivityManager.Stub {
NetworkInfo i = net.getNetworkInfo();
if (i.isConnected() &&
!mNetAttributes[i.getType()].isDefault()) {
if (DBG) {
Log.d(TAG, "tearing down " + i +
" to restore the default network");
}
teardown(net);
}
}