Merge "Remove CONNECTIVITY_ACTION and INET_CONDITION_ACTION" am: 50d1eb59a4 am: 8f834c68bf am: 75b719adf1 am: 5759c2352a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432493

Change-Id: Id9c2558abc74947c124c6d14f0864530f26d62f5
This commit is contained in:
Chiachang Wang
2020-09-25 06:19:33 +00:00
committed by Automerger Merge Worker

View File

@@ -23,7 +23,6 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.net.ConnectivityManager;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.RemoteException; import android.os.RemoteException;
@@ -70,8 +69,6 @@ public class DataConnectionStats extends BroadcastReceiver {
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(Intent.ACTION_SIM_STATE_CHANGED); filter.addAction(Intent.ACTION_SIM_STATE_CHANGED);
filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
filter.addAction(ConnectivityManager.INET_CONDITION_ACTION);
mContext.registerReceiver(this, filter, null /* broadcastPermission */, mListenerHandler); mContext.registerReceiver(this, filter, null /* broadcastPermission */, mListenerHandler);
} }
@@ -81,10 +78,7 @@ public class DataConnectionStats extends BroadcastReceiver {
if (action.equals(Intent.ACTION_SIM_STATE_CHANGED)) { if (action.equals(Intent.ACTION_SIM_STATE_CHANGED)) {
updateSimState(intent); updateSimState(intent);
notePhoneDataConnectionState(); notePhoneDataConnectionState();
} else if (action.equals(ConnectivityManager.CONNECTIVITY_ACTION) || }
action.equals(ConnectivityManager.INET_CONDITION_ACTION)) {
notePhoneDataConnectionState();
}
} }
private void notePhoneDataConnectionState() { private void notePhoneDataConnectionState() {