[Settings] Use TelephonyManasger.registerTelephonyCallback instead of TelephonyManager.listen
Bug: 175270951
Test: make and atest
Change-Id: I15e1a199e6a34914db97055bfea9392c5bbdc9c6
diff --git a/src/com/android/settings/AirplaneModeEnabler.java b/src/com/android/settings/AirplaneModeEnabler.java
index 6028c18..8b29d67 100644
--- a/src/com/android/settings/AirplaneModeEnabler.java
+++ b/src/com/android/settings/AirplaneModeEnabler.java
@@ -24,6 +24,7 @@
import android.provider.Settings;
import android.telephony.PhoneStateListener;
import android.telephony.SubscriptionInfo;
+import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.util.Log;
@@ -61,7 +62,7 @@
private TelephonyManager mTelephonyManager;
@VisibleForTesting
- PhoneStateListener mPhoneStateListener;
+ AirplaneModeTelephonyCallback mTelephonyCallback;
public AirplaneModeEnabler(Context context, OnAirplaneModeChangedListener listener) {
super(context, Settings.Global.AIRPLANE_MODE_ON);
@@ -71,16 +72,18 @@
mOnAirplaneModeChangedListener = listener;
mTelephonyManager = context.getSystemService(TelephonyManager.class);
+ mTelephonyCallback = new AirplaneModeTelephonyCallback();
+ }
- mPhoneStateListener = new PhoneStateListener(Looper.getMainLooper()) {
- @Override
- public void onRadioPowerStateChanged(int state) {
- if (DEBUG) {
- Log.d(LOG_TAG, "RadioPower: " + state);
- }
- onAirplaneModeChanged();
+ class AirplaneModeTelephonyCallback extends TelephonyCallback implements
+ TelephonyCallback.RadioPowerStateListener {
+ @Override
+ public void onRadioPowerStateChanged(int state) {
+ if (DEBUG) {
+ Log.d(LOG_TAG, "RadioPower: " + state);
}
- };
+ onAirplaneModeChanged();
+ }
}
/**
@@ -98,16 +101,14 @@
* Start listening to the phone state change
*/
public void start() {
- mTelephonyManager.listen(mPhoneStateListener,
- PhoneStateListener.LISTEN_RADIO_POWER_STATE_CHANGED);
+ mTelephonyManager.registerTelephonyCallback(mContext.getMainExecutor(), mTelephonyCallback);
}
/**
* Stop listening to the phone state change
*/
public void stop() {
- mTelephonyManager.listen(mPhoneStateListener,
- PhoneStateListener.LISTEN_NONE);
+ mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
}
private void setAirplaneModeOn(boolean enabling) {
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index a6a211e..1e25179 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -44,6 +44,7 @@
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
+import android.telephony.TelephonyCallback;
import android.telephony.TelephonyDisplayInfo;
import android.telephony.TelephonyManager;
import android.telephony.UiccCardInfo;
@@ -170,7 +171,8 @@
}
};
- private PhoneStateListener mPhoneStateListener;
+ @VisibleForTesting
+ protected SimStatusDialogTelephonyCallback mTelephonyCallback;
private CellBroadcastServiceConnection mCellBroadcastServiceConnection;
@@ -235,7 +237,7 @@
}
mTelephonyManager =
mTelephonyManager.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
- mPhoneStateListener = getPhoneStateListener();
+ mTelephonyCallback = new SimStatusDialogTelephonyCallback();
updateLatestAreaInfo();
updateSubscriptionStatus();
}
@@ -278,11 +280,7 @@
}
mTelephonyManager = mTelephonyManager.createForSubscriptionId(
mSubscriptionInfo.getSubscriptionId());
- mTelephonyManager.listen(mPhoneStateListener,
- PhoneStateListener.LISTEN_DATA_CONNECTION_STATE
- | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS
- | PhoneStateListener.LISTEN_SERVICE_STATE
- | PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED);
+ mTelephonyManager.registerTelephonyCallback(mContext.getMainExecutor(), mTelephonyCallback);
mSubscriptionManager.addOnSubscriptionsChangedListener(
mContext.getMainExecutor(), mOnSubscriptionsChangedListener);
registerImsRegistrationCallback(mSubscriptionInfo.getSubscriptionId());
@@ -305,7 +303,7 @@
if (mIsRegisteredListener) {
mSubscriptionManager.removeOnSubscriptionsChangedListener(
mOnSubscriptionsChangedListener);
- mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+ mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
if (mShowLatestAreaInfo) {
mContext.unregisterReceiver(mAreaInfoReceiver);
}
@@ -316,7 +314,7 @@
unregisterImsRegistrationCallback(mSubscriptionInfo.getSubscriptionId());
mSubscriptionManager.removeOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);
- mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+ mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
if (mShowLatestAreaInfo) {
mContext.unregisterReceiver(mAreaInfoReceiver);
@@ -768,33 +766,35 @@
}
@VisibleForTesting
- protected PhoneStateListener getPhoneStateListener() {
- return new PhoneStateListener() {
- @Override
- public void onDataConnectionStateChanged(int state) {
- updateDataState(state);
- updateNetworkType();
- }
+ class SimStatusDialogTelephonyCallback extends TelephonyCallback implements
+ TelephonyCallback.DataConnectionStateListener,
+ TelephonyCallback.SignalStrengthsListener,
+ TelephonyCallback.ServiceStateListener,
+ TelephonyCallback.DisplayInfoListener {
+ @Override
+ public void onDataConnectionStateChanged(int state, int networkType) {
+ updateDataState(state);
+ updateNetworkType();
+ }
- @Override
- public void onSignalStrengthsChanged(SignalStrength signalStrength) {
- updateSignalStrength(signalStrength);
- }
+ @Override
+ public void onSignalStrengthsChanged(SignalStrength signalStrength) {
+ updateSignalStrength(signalStrength);
+ }
- @Override
- public void onServiceStateChanged(ServiceState serviceState) {
- updateNetworkProvider();
- updateServiceState(serviceState);
- updateRoamingStatus(serviceState);
- mPreviousServiceState = serviceState;
- }
+ @Override
+ public void onServiceStateChanged(ServiceState serviceState) {
+ updateNetworkProvider();
+ updateServiceState(serviceState);
+ updateRoamingStatus(serviceState);
+ mPreviousServiceState = serviceState;
+ }
- @Override
- public void onDisplayInfoChanged(@NonNull TelephonyDisplayInfo displayInfo) {
- mTelephonyDisplayInfo = displayInfo;
- updateNetworkType();
- }
- };
+ @Override
+ public void onDisplayInfoChanged(@NonNull TelephonyDisplayInfo displayInfo) {
+ mTelephonyDisplayInfo = displayInfo;
+ updateNetworkType();
+ }
}
@VisibleForTesting
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index b968438..527a632 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -28,6 +28,7 @@
import android.provider.Settings;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
+import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import androidx.annotation.VisibleForTesting;
@@ -55,7 +56,7 @@
private final UserManager mUserManager;
private Preference mPreference;
@VisibleForTesting
- PhoneStateListener mPhoneStateListener;
+ MobileNetworkTelephonyCallback mTelephonyCallback;
private BroadcastReceiver mAirplanModeChangedReceiver;
@@ -97,18 +98,22 @@
return KEY_MOBILE_NETWORK_SETTINGS;
}
+ class MobileNetworkTelephonyCallback extends TelephonyCallback implements
+ TelephonyCallback.ServiceStateListener {
+ @Override
+ public void onServiceStateChanged(ServiceState serviceState) {
+ updateState(mPreference);
+ }
+ }
+
@OnLifecycleEvent(Event.ON_START)
public void onStart() {
if (isAvailable()) {
- if (mPhoneStateListener == null) {
- mPhoneStateListener = new PhoneStateListener() {
- @Override
- public void onServiceStateChanged(ServiceState serviceState) {
- updateState(mPreference);
- }
- };
+ if (mTelephonyCallback == null) {
+ mTelephonyCallback = new MobileNetworkTelephonyCallback();
}
- mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
+ mTelephonyManager.registerTelephonyCallback(
+ mContext.getMainExecutor(), mTelephonyCallback);
}
if (mAirplanModeChangedReceiver != null) {
mContext.registerReceiver(mAirplanModeChangedReceiver,
@@ -118,8 +123,8 @@
@OnLifecycleEvent(Event.ON_STOP)
public void onStop() {
- if (mPhoneStateListener != null) {
- mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+ if (mTelephonyCallback != null) {
+ mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback);
}
if (mAirplanModeChangedReceiver != null) {
mContext.unregisterReceiver(mAirplanModeChangedReceiver);
diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index c2b1fc4..1f1cb37 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -20,11 +20,11 @@
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
-import android.os.Looper;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.PhoneStateListener;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.telephony.ims.ImsMmTelManager;
import android.util.Log;
@@ -53,7 +53,7 @@
@VisibleForTesting
Preference mPreference;
- private PhoneCallStateListener mPhoneStateListener;
+ private PhoneCallStateTelephonyCallback mTelephonyCallback;
private boolean mShow5gLimitedDialog;
boolean mIsNrEnabledFromCarrierConfig;
private boolean mHas5gCapability;
@@ -72,8 +72,8 @@
}
public Enhanced4gBasePreferenceController init(int subId) {
- if (mPhoneStateListener == null) {
- mPhoneStateListener = new PhoneCallStateListener();
+ if (mTelephonyCallback == null) {
+ mTelephonyCallback = new PhoneCallStateTelephonyCallback();
}
if (mSubId == subId) {
@@ -134,18 +134,18 @@
@Override
public void onStart() {
- if (!isModeMatched() || (mPhoneStateListener == null)) {
+ if (!isModeMatched() || (mTelephonyCallback == null)) {
return;
}
- mPhoneStateListener.register(mContext, mSubId);
+ mTelephonyCallback.register(mContext, mSubId);
}
@Override
public void onStop() {
- if (mPhoneStateListener == null) {
+ if (mTelephonyCallback == null) {
return;
}
- mPhoneStateListener.unregister();
+ mTelephonyCallback.unregister();
}
@Override
@@ -218,16 +218,13 @@
CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
}
- private class PhoneCallStateListener extends PhoneStateListener {
-
- PhoneCallStateListener() {
- super(Looper.getMainLooper());
- }
+ private class PhoneCallStateTelephonyCallback extends TelephonyCallback implements
+ TelephonyCallback.CallStateListener {
private TelephonyManager mTelephonyManager;
@Override
- public void onCallStateChanged(int state, String incomingNumber) {
+ public void onCallStateChanged(int state) {
mCallState = state;
updateState(mPreference);
}
@@ -240,7 +237,8 @@
// assign current call state so that it helps to show correct preference state even
// before first onCallStateChanged() by initial registration.
mCallState = mTelephonyManager.getCallState(subId);
- mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+ mTelephonyManager.registerTelephonyCallback(
+ mContext.getMainExecutor(), mTelephonyCallback);
final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
mHas5gCapability =
@@ -250,7 +248,7 @@
public void unregister() {
mCallState = null;
if (mTelephonyManager != null) {
- mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+ mTelephonyManager.unregisterTelephonyCallback(this);
}
}
}
diff --git a/src/com/android/settings/network/telephony/SignalStrengthListener.java b/src/com/android/settings/network/telephony/SignalStrengthListener.java
index 0e29a45..8d7304d 100644
--- a/src/com/android/settings/network/telephony/SignalStrengthListener.java
+++ b/src/com/android/settings/network/telephony/SignalStrengthListener.java
@@ -19,9 +19,12 @@
import android.content.Context;
import android.telephony.PhoneStateListener;
import android.telephony.SignalStrength;
+import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.util.ArraySet;
+import androidx.annotation.VisibleForTesting;
+
import com.google.common.collect.Sets;
import java.util.Map;
@@ -34,7 +37,9 @@
private TelephonyManager mBaseTelephonyManager;
private Callback mCallback;
- private Map<Integer, PhoneStateListener> mListeners;
+ private Context mContext;
+ @VisibleForTesting
+ Map<Integer, SignalStrengthTelephonyCallback> mTelephonyCallbacks;
public interface Callback {
void onSignalStrengthChanged();
@@ -43,20 +48,21 @@
public SignalStrengthListener(Context context, Callback callback) {
mBaseTelephonyManager = context.getSystemService(TelephonyManager.class);
mCallback = callback;
- mListeners = new TreeMap<>();
+ mContext = context;
+ mTelephonyCallbacks = new TreeMap<>();
}
/** Resumes listening for signal strength changes for the set of ids from the last call to
* {@link #updateSubscriptionIds(Set)} */
public void resume() {
- for (int subId : mListeners.keySet()) {
+ for (int subId : mTelephonyCallbacks.keySet()) {
startListening(subId);
}
}
/** Pauses listening for signal strength changes */
public void pause() {
- for (int subId : mListeners.keySet()) {
+ for (int subId : mTelephonyCallbacks.keySet()) {
stopListening(subId);
}
}
@@ -64,30 +70,36 @@
/** Updates the set of ids we want to be listening for, beginning to listen for any new ids and
* stopping listening for any ids not contained in the new set */
public void updateSubscriptionIds(Set<Integer> ids) {
- Set<Integer> currentIds = new ArraySet<>(mListeners.keySet());
+ Set<Integer> currentIds = new ArraySet<>(mTelephonyCallbacks.keySet());
for (int idToRemove : Sets.difference(currentIds, ids)) {
stopListening(idToRemove);
- mListeners.remove(idToRemove);
+ mTelephonyCallbacks.remove(idToRemove);
}
for (int idToAdd : Sets.difference(ids, currentIds)) {
- PhoneStateListener listener = new PhoneStateListener() {
- @Override
- public void onSignalStrengthsChanged(SignalStrength signalStrength) {
- mCallback.onSignalStrengthChanged();
- }
- };
- mListeners.put(idToAdd, listener);
+ SignalStrengthTelephonyCallback telephonyCallback =
+ new SignalStrengthTelephonyCallback();
+ mTelephonyCallbacks.put(idToAdd, telephonyCallback);
startListening(idToAdd);
}
}
+ @VisibleForTesting
+ class SignalStrengthTelephonyCallback extends TelephonyCallback implements
+ TelephonyCallback.SignalStrengthsListener {
+ @Override
+ public void onSignalStrengthsChanged(SignalStrength signalStrength) {
+ mCallback.onSignalStrengthChanged();
+ }
+ }
+
private void startListening(int subId) {
TelephonyManager mgr = mBaseTelephonyManager.createForSubscriptionId(subId);
- mgr.listen(mListeners.get(subId), PhoneStateListener.LISTEN_SIGNAL_STRENGTHS);
+ mgr.registerTelephonyCallback(
+ mContext.getMainExecutor(), mTelephonyCallbacks.get(subId));
}
private void stopListening(int subId) {
TelephonyManager mgr = mBaseTelephonyManager.createForSubscriptionId(subId);
- mgr.listen(mListeners.get(subId), PhoneStateListener.LISTEN_NONE);
+ mgr.unregisterTelephonyCallback(mTelephonyCallbacks.get(subId));
}
}
diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
index fa8b47f..b3421f4 100644
--- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
@@ -17,11 +17,11 @@
package com.android.settings.network.telephony;
import android.content.Context;
-import android.os.Looper;
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.PhoneStateListener;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.telephony.ims.ImsMmTelManager;
import android.util.Log;
@@ -50,7 +50,7 @@
private Preference mPreference;
private CarrierConfigManager mCarrierConfigManager;
- private PhoneCallStateListener mPhoneStateListener;
+ private PhoneTelephonyCallback mTelephonyCallback;
@VisibleForTesting
Integer mCallState;
private MobileDataEnabledListener mDataContentObserver;
@@ -59,7 +59,7 @@
super(context, key);
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
mDataContentObserver = new MobileDataEnabledListener(context, this);
- mPhoneStateListener = new PhoneCallStateListener();
+ mTelephonyCallback = new PhoneTelephonyCallback();
}
@Override
@@ -78,13 +78,13 @@
@Override
public void onStart() {
- mPhoneStateListener.register(mContext, mSubId);
+ mTelephonyCallback.register(mContext, mSubId);
mDataContentObserver.start(mSubId);
}
@Override
public void onStop() {
- mPhoneStateListener.unregister();
+ mTelephonyCallback.unregister();
mDataContentObserver.stop();
}
@@ -163,16 +163,13 @@
updateState(mPreference);
}
- private class PhoneCallStateListener extends PhoneStateListener {
-
- PhoneCallStateListener() {
- super(Looper.getMainLooper());
- }
+ private class PhoneTelephonyCallback extends TelephonyCallback implements
+ TelephonyCallback.CallStateListener {
private TelephonyManager mTelephonyManager;
@Override
- public void onCallStateChanged(int state, String incomingNumber) {
+ public void onCallStateChanged(int state) {
mCallState = state;
updateState(mPreference);
}
@@ -185,12 +182,12 @@
// assign current call state so that it helps to show correct preference state even
// before first onCallStateChanged() by initial registration.
mCallState = mTelephonyManager.getCallState(subId);
- mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+ mTelephonyManager.registerTelephonyCallback(context.getMainExecutor(), this);
}
public void unregister() {
mCallState = null;
- mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+ mTelephonyManager.unregisterTelephonyCallback(this);
}
}
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
index 94a5999..2d7ba38 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -20,7 +20,6 @@
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.os.Looper;
import android.os.PersistableBundle;
import android.provider.Settings;
import android.telecom.PhoneAccountHandle;
@@ -28,6 +27,7 @@
import android.telephony.CarrierConfigManager;
import android.telephony.PhoneStateListener;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.telephony.ims.ImsMmTelManager;
import android.util.Log;
@@ -60,13 +60,13 @@
private ImsMmTelManager mImsMmTelManager;
@VisibleForTesting
PhoneAccountHandle mSimCallManager;
- private PhoneCallStateListener mPhoneStateListener;
+ private PhoneTelephonyCallback mTelephonyCallback;
private Preference mPreference;
public WifiCallingPreferenceController(Context context, String key) {
super(context, key);
mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
- mPhoneStateListener = new PhoneCallStateListener();
+ mTelephonyCallback = new PhoneTelephonyCallback();
}
@Override
@@ -79,12 +79,12 @@
@Override
public void onStart() {
- mPhoneStateListener.register(mContext, mSubId);
+ mTelephonyCallback.register(mContext, mSubId);
}
@Override
public void onStop() {
- mPhoneStateListener.unregister();
+ mTelephonyCallback.unregister();
}
@Override
@@ -195,16 +195,13 @@
}
- private class PhoneCallStateListener extends PhoneStateListener {
-
- PhoneCallStateListener() {
- super(Looper.getMainLooper());
- }
+ private class PhoneTelephonyCallback extends TelephonyCallback implements
+ TelephonyCallback.CallStateListener {
private TelephonyManager mTelephonyManager;
@Override
- public void onCallStateChanged(int state, String incomingNumber) {
+ public void onCallStateChanged(int state) {
mCallState = state;
updateState(mPreference);
}
@@ -214,12 +211,12 @@
// assign current call state so that it helps to show correct preference state even
// before first onCallStateChanged() by initial registration.
mCallState = mTelephonyManager.getCallState(subId);
- mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
+ mTelephonyManager.registerTelephonyCallback(context.getMainExecutor(), this);
}
public void unregister() {
mCallState = null;
- mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+ mTelephonyManager.unregisterTelephonyCallback(this);
}
}
}
diff --git a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
index 024c1c3..de64b91 100644
--- a/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
+++ b/src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
@@ -29,6 +29,7 @@
import android.telephony.CarrierConfigManager;
import android.telephony.PhoneStateListener;
import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import android.telephony.ims.ImsManager;
import android.telephony.ims.ImsMmTelManager;
@@ -102,7 +103,10 @@
private ProvisioningManager mProvisioningManager;
private TelephonyManager mTelephonyManager;
- private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+ private final PhoneTelephonyCallback mTelephonyCallback = new PhoneTelephonyCallback();
+
+ private class PhoneTelephonyCallback extends TelephonyCallback implements
+ TelephonyCallback.CallStateListener {
/*
* Enable/disable controls when in/out of a call and depending on
* TTY mode and TTY support over VoLTE.
@@ -110,7 +114,7 @@
* java.lang.String)
*/
@Override
- public void onCallStateChanged(int state, String incomingNumber) {
+ public void onCallStateChanged(int state) {
final SettingsActivity activity = (SettingsActivity) getActivity();
final boolean isNonTtyOrTtyOnVolteEnabled =
queryImsState(WifiCallingSettingsForSub.this.mSubId).isAllowUserControl();
@@ -149,7 +153,7 @@
&& isCallStateIdle);
}
}
- };
+ }
/*
* Launch carrier emergency address managemnent activity
@@ -398,7 +402,7 @@
res.getStringArray(R.array.wifi_calling_mode_summaries_without_wifi_only));
}
- // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
+ // NOTE: Buttons will be enabled/disabled in mTelephonyCallback
final WifiCallingQueryImsState queryIms = queryImsState(mSubId);
final boolean wfcEnabled = queryIms.isEnabledByUser()
&& queryIms.isAllowUserControl();
@@ -416,16 +420,16 @@
updateBody();
+ final Context context = getActivity();
if (queryImsState(mSubId).isWifiCallingSupported()) {
- getTelephonyManagerForSub(mSubId).listen(mPhoneStateListener,
- PhoneStateListener.LISTEN_CALL_STATE);
+ getTelephonyManagerForSub(mSubId).registerTelephonyCallback(
+ context.getMainExecutor(), mTelephonyCallback);
mSwitchBar.addOnSwitchChangeListener(this);
mValidListener = true;
}
- final Context context = getActivity();
context.registerReceiver(mIntentReceiver, mIntentFilter);
final Intent intent = getActivity().getIntent();
@@ -446,8 +450,7 @@
if (mValidListener) {
mValidListener = false;
- getTelephonyManagerForSub(mSubId).listen(mPhoneStateListener,
- PhoneStateListener.LISTEN_NONE);
+ getTelephonyManagerForSub(mSubId).unregisterTelephonyCallback(mTelephonyCallback);
mSwitchBar.removeOnSwitchChangeListener(this);
}
diff --git a/tests/robotests/src/com/android/settings/AirplaneModeEnablerTest.java b/tests/robotests/src/com/android/settings/AirplaneModeEnablerTest.java
index 6c5b9f2..5ac5c66 100644
--- a/tests/robotests/src/com/android/settings/AirplaneModeEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/AirplaneModeEnablerTest.java
@@ -57,7 +57,7 @@
ShadowSettings.setAirplaneMode(true);
- mAirplaneModeEnabler.mPhoneStateListener.onRadioPowerStateChanged(
+ mAirplaneModeEnabler.mTelephonyCallback.onRadioPowerStateChanged(
TelephonyManager.RADIO_POWER_OFF);
verify(mAirplaneModeChangedListener, times(1)).onAirplaneModeChanged(true);
diff --git a/tests/robotests/src/com/android/settings/network/telephony/SignalStrengthListenerTest.java b/tests/robotests/src/com/android/settings/network/telephony/SignalStrengthListenerTest.java
index 406f360..6abf8a0 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/SignalStrengthListenerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/SignalStrengthListenerTest.java
@@ -16,13 +16,9 @@
package com.android.settings.network.telephony;
-import static android.telephony.PhoneStateListener.LISTEN_NONE;
-import static android.telephony.PhoneStateListener.LISTEN_SIGNAL_STRENGTHS;
-
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
@@ -31,7 +27,7 @@
import static org.mockito.Mockito.when;
import android.content.Context;
-import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyCallback;
import android.telephony.TelephonyManager;
import org.junit.Before;
@@ -44,6 +40,8 @@
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
+import java.util.concurrent.Executor;
+
@RunWith(RobolectricTestRunner.class)
public class SignalStrengthListenerTest {
private static final int SUB_ID_1 = 111;
@@ -88,13 +86,19 @@
@Test
public void updateSubscriptionIds_beforeResume_startedListening() {
mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2));
- ArgumentCaptor<PhoneStateListener> captor1 = ArgumentCaptor.forClass(
- PhoneStateListener.class);
- ArgumentCaptor<PhoneStateListener> captor2 = ArgumentCaptor.forClass(
- PhoneStateListener.class);
- verify(mManager1).listen(captor1.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
- verify(mManager2).listen(captor2.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
- verify(mManager3, never()).listen(any(), anyInt());
+ ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor1 =
+ ArgumentCaptor.forClass(
+ SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+ ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor2 =
+ ArgumentCaptor.forClass(
+ SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+
+ verify(mManager1).registerTelephonyCallback(
+ any(Executor.class), captor1.capture());
+ verify(mManager2).registerTelephonyCallback(
+ any(Executor.class), captor2.capture());
+ verify(mManager3, never()).registerTelephonyCallback(any(), any());
+
assertThat(captor1.getValue()).isNotNull();
assertThat(captor2.getValue()).isNotNull();
@@ -105,46 +109,57 @@
@Test
public void updateSubscriptionIds_twoCalls_oneIdAdded() {
mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2));
- verify(mManager1).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
- verify(mManager2).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
+
+ verify(mManager1).registerTelephonyCallback(any(Executor.class),
+ eq(mListener.mTelephonyCallbacks.get(SUB_ID_1)));
+ verify(mManager2).registerTelephonyCallback(any(Executor.class),
+ eq(mListener.mTelephonyCallbacks.get(SUB_ID_2)));
mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2, SUB_ID_3));
- verify(mManager1, never()).listen(any(PhoneStateListener.class), eq(LISTEN_NONE));
- verify(mManager2, never()).listen(any(PhoneStateListener.class), eq(LISTEN_NONE));
- verify(mManager3).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
+ verify(mManager1, never()).unregisterTelephonyCallback(
+ mListener.mTelephonyCallbacks.get(SUB_ID_1));
+ verify(mManager2, never()).unregisterTelephonyCallback(
+ mListener.mTelephonyCallbacks.get(SUB_ID_2));
+ verify(mManager3).registerTelephonyCallback(
+ any(Executor.class), eq(mListener.mTelephonyCallbacks.get(SUB_ID_3)));
}
@Test
public void updateSubscriptionIds_twoCalls_oneIdRemoved() {
- ArgumentCaptor<PhoneStateListener> captor1 = ArgumentCaptor.forClass(
- PhoneStateListener.class);
+ ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor1 =
+ ArgumentCaptor.forClass(
+ SignalStrengthListener.SignalStrengthTelephonyCallback.class);
mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2));
- verify(mManager1).listen(captor1.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
- verify(mManager2).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
+ verify(mManager1).registerTelephonyCallback(any(Executor.class), captor1.capture());
+ verify(mManager2).registerTelephonyCallback(
+ any(Executor.class), any(TelephonyCallback.class));
mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_2));
- verify(mManager1).listen(captor1.capture(), eq(LISTEN_NONE));
- verify(mManager2, never()).listen(any(PhoneStateListener.class), eq(LISTEN_NONE));
+ verify(mManager1).unregisterTelephonyCallback(captor1.capture());
+ verify(mManager2, never()).unregisterTelephonyCallback(any(TelephonyCallback.class));
// Make sure the correct listener was removed.
assertThat(captor1.getAllValues().get(0) == captor1.getAllValues().get(1)).isTrue();
}
@Test
public void updateSubscriptionIds_twoCalls_twoIdsRemovedOneAdded() {
- ArgumentCaptor<PhoneStateListener> captor1 = ArgumentCaptor.forClass(
- PhoneStateListener.class);
- ArgumentCaptor<PhoneStateListener> captor2 = ArgumentCaptor.forClass(
- PhoneStateListener.class);
+ ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor1 =
+ ArgumentCaptor.forClass(
+ SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+ ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor2 =
+ ArgumentCaptor.forClass(
+ SignalStrengthListener.SignalStrengthTelephonyCallback.class);
mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_1, SUB_ID_2));
- verify(mManager1).listen(captor1.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
- verify(mManager2).listen(captor2.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
+ verify(mManager1).registerTelephonyCallback(any(Executor.class), captor1.capture());
+ verify(mManager2).registerTelephonyCallback(any(Executor.class), captor2.capture());
mListener.updateSubscriptionIds(Sets.newSet(SUB_ID_3));
- verify(mManager1).listen(captor1.capture(), eq(LISTEN_NONE));
- verify(mManager2).listen(captor2.capture(), eq(LISTEN_NONE));
- verify(mManager3).listen(any(PhoneStateListener.class), eq(LISTEN_SIGNAL_STRENGTHS));
+ verify(mManager1).unregisterTelephonyCallback(captor1.capture());
+ verify(mManager2).unregisterTelephonyCallback(captor2.capture());
+ verify(mManager3).registerTelephonyCallback(
+ any(Executor.class), any(TelephonyCallback.class));
// Make sure the correct listeners were removed.
assertThat(captor1.getValue() != captor2.getValue()).isTrue();
assertThat(captor1.getAllValues().get(0) == captor1.getAllValues().get(1)).isTrue();
@@ -157,15 +172,19 @@
mListener.pause();
mListener.resume();
- ArgumentCaptor<PhoneStateListener> captor1 = ArgumentCaptor.forClass(
- PhoneStateListener.class);
- ArgumentCaptor<PhoneStateListener> captor2 = ArgumentCaptor.forClass(
- PhoneStateListener.class);
- verify(mManager1, times(2)).listen(captor1.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
- verify(mManager1).listen(captor1.capture(), eq(LISTEN_NONE));
+ ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor1 =
+ ArgumentCaptor.forClass(
+ SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+ ArgumentCaptor<SignalStrengthListener.SignalStrengthTelephonyCallback> captor2 =
+ ArgumentCaptor.forClass(
+ SignalStrengthListener.SignalStrengthTelephonyCallback.class);
+ verify(mManager1, times(2)).registerTelephonyCallback(
+ any(Executor.class), captor1.capture());
+ verify(mManager1).unregisterTelephonyCallback(captor1.capture());
- verify(mManager2, times(2)).listen(captor2.capture(), eq(LISTEN_SIGNAL_STRENGTHS));
- verify(mManager2).listen(captor2.capture(), eq(LISTEN_NONE));
+ verify(mManager2, times(2)).registerTelephonyCallback(
+ any(Executor.class), captor2.capture());
+ verify(mManager2).unregisterTelephonyCallback(captor2.capture());
assertThat(captor1.getAllValues().get(0) == captor1.getAllValues().get(1)).isTrue();
assertThat(captor1.getAllValues().get(0) == captor1.getAllValues().get(2)).isTrue();
diff --git a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
index ae534d0..dfe2bc0 100644
--- a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -48,7 +48,6 @@
import android.os.PersistableBundle;
import android.telephony.CarrierConfigManager;
import android.telephony.CellSignalStrength;
-import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
import android.telephony.SignalStrength;
import android.telephony.SubscriptionInfo;
@@ -89,8 +88,6 @@
@Mock
private ServiceState mServiceState;
@Mock
- private PhoneStateListener mPhoneStateListener;
- @Mock
private SignalStrength mSignalStrength;
@Mock
private CellSignalStrength mCellSignalStrengthCdma;
@@ -150,7 +147,6 @@
doReturn(0).when(mCellSignalStrengthWcdma).getAsuLevel();
doReturn(null).when(mSignalStrength).getCellSignalStrengths();
- doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();
doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
diff --git a/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
index c540512..d22e390 100644
--- a/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -124,13 +124,12 @@
mLifecycleRegistry.handleLifecycleEvent(Event.ON_START);
verify(mController).onStart();
- verify(mTelephonyManager).listen(mController.mPhoneStateListener,
- PhoneStateListener.LISTEN_SERVICE_STATE);
+ verify(mTelephonyManager).registerTelephonyCallback(
+ mContext.getMainExecutor(), mController.mTelephonyCallback);
mLifecycleRegistry.handleLifecycleEvent(Event.ON_STOP);
verify(mController).onStop();
- verify(mTelephonyManager).listen(mController.mPhoneStateListener,
- PhoneStateListener.LISTEN_NONE);
+ verify(mTelephonyManager).unregisterTelephonyCallback(mController.mTelephonyCallback);
}
@Test
@@ -148,12 +147,12 @@
mController.displayPreference(mScreen);
mLifecycleRegistry.handleLifecycleEvent(Event.ON_START);
verify(mController).onStart();
- verify(mTelephonyManager).listen(mController.mPhoneStateListener,
- PhoneStateListener.LISTEN_SERVICE_STATE);
+ verify(mTelephonyManager).registerTelephonyCallback(
+ mContext.getMainExecutor(), mController.mTelephonyCallback);
doReturn(testCarrierName).when(mController).getSummary();
- mController.mPhoneStateListener.onServiceStateChanged(null);
+ mController.mTelephonyCallback.onServiceStateChanged(null);
// Carrier name should be set.
Assert.assertEquals(mPreference.getSummary(), testCarrierName);