diff --git a/src/com/android/settings/network/AllowedNetworkTypesListener.java b/src/com/android/settings/network/AllowedNetworkTypesListener.java index a11f3b41301..a9ed8be7327 100644 --- a/src/com/android/settings/network/AllowedNetworkTypesListener.java +++ b/src/com/android/settings/network/AllowedNetworkTypesListener.java @@ -18,6 +18,7 @@ package com.android.settings.network; import android.content.Context; import android.telephony.PhoneStateListener; +import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; import android.util.Log; @@ -28,14 +29,14 @@ import java.util.concurrent.Executor; /** - * {@link PhoneStateListener} to listen to Allowed Network Types changed + * {@link TelephonyCallback} to listen to Allowed Network Types changed */ -public class AllowedNetworkTypesListener extends PhoneStateListener implements - PhoneStateListener.AllowedNetworkTypesChangedListener { +public class AllowedNetworkTypesListener extends TelephonyCallback implements + TelephonyCallback.AllowedNetworkTypesListener { private static final String LOG_TAG = "NetworkModeListener"; @VisibleForTesting - AllowedNetworkTypesListener.OnAllowedNetworkTypesChangedListener mListener; + OnAllowedNetworkTypesListener mListener; private long mAllowedNetworkType = -1; private Executor mExecutor; @@ -44,7 +45,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements mExecutor = executor; } - public void setAllowedNetworkTypesChangedListener(OnAllowedNetworkTypesChangedListener lsn) { + public void setAllowedNetworkTypesListener(OnAllowedNetworkTypesListener lsn) { mListener = lsn; } @@ -56,7 +57,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements public void register(Context context, int subId) { TelephonyManager telephonyManager = context.getSystemService( TelephonyManager.class).createForSubscriptionId(subId); - telephonyManager.registerPhoneStateListener(mExecutor, this); + telephonyManager.registerTelephonyCallback(mExecutor, this); } /** @@ -67,7 +68,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements public void unregister(Context context, int subId) { TelephonyManager telephonyManager = context.getSystemService( TelephonyManager.class).createForSubscriptionId(subId); - telephonyManager.unregisterPhoneStateListener(this); + telephonyManager.unregisterTelephonyCallback(this); } @Override @@ -84,7 +85,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements /** * Listener for update of Preferred Network Mode change */ - public interface OnAllowedNetworkTypesChangedListener { + public interface OnAllowedNetworkTypesListener { /** * Notify the allowed network type changed. */ diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index 5680bf60140..f0d4a431c0b 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -151,7 +151,7 @@ public class EnabledNetworkModePreferenceController extends if (mAllowedNetworkTypesListener == null) { mAllowedNetworkTypesListener = new AllowedNetworkTypesListener( mContext.getMainExecutor()); - mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener( + mAllowedNetworkTypesListener.setAllowedNetworkTypesListener( () -> updatePreference()); } diff --git a/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java b/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java index 25651f5379e..4ebcb7a59d6 100644 --- a/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java +++ b/src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java @@ -45,7 +45,7 @@ public class NetworkPreferenceCategoryController extends PreferenceCategoryContr mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; mAllowedNetworkTypesListener = new AllowedNetworkTypesListener( context.getMainExecutor()); - mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener( + mAllowedNetworkTypesListener.setAllowedNetworkTypesListener( () -> updatePreference()); } diff --git a/src/com/android/settings/network/telephony/NetworkProviderWorker.java b/src/com/android/settings/network/telephony/NetworkProviderWorker.java index 9e23c7ce2dc..57f17b59560 100644 --- a/src/com/android/settings/network/telephony/NetworkProviderWorker.java +++ b/src/com/android/settings/network/telephony/NetworkProviderWorker.java @@ -25,9 +25,9 @@ import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; import android.os.Looper; -import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.SubscriptionManager; +import android.telephony.TelephonyCallback; import android.telephony.TelephonyDisplayInfo; import android.telephony.TelephonyManager; import android.util.Log; @@ -62,7 +62,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements private final Context mContext; final Handler mHandler; @VisibleForTesting - final PhoneStateListener mPhoneStateListener; + final NetworkProviderTelephonyCallback mTelephonyCallback; private TelephonyManager mTelephonyManager; private Config mConfig = null; private TelephonyDisplayInfo mTelephonyDisplayInfo = @@ -82,7 +82,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements mTelephonyManager = mContext.getSystemService( TelephonyManager.class).createForSubscriptionId(mDefaultDataSubid); - mPhoneStateListener = new NetworkProviderPhoneStateListener(); + mTelephonyCallback = new NetworkProviderTelephonyCallback(); mSubscriptionsListener = new SubscriptionsChangeListener(context, this); mDataEnabledListener = new MobileDataEnabledListener(context, this); mConnectivityListener = new DataConnectivityListener(context, this); @@ -100,7 +100,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements mDataEnabledListener.start(mDefaultDataSubid); mConnectivityListener.start(); mSignalStrengthListener.resume(); - mTelephonyManager.registerPhoneStateListener(mHandler::post, mPhoneStateListener); + mTelephonyManager.registerTelephonyCallback(mHandler::post, mTelephonyCallback); super.onSlicePinned(); } @@ -111,7 +111,7 @@ public class NetworkProviderWorker extends WifiScanWorker implements mDataEnabledListener.stop(); mConnectivityListener.stop(); mSignalStrengthListener.pause(); - mTelephonyManager.unregisterPhoneStateListener(mPhoneStateListener); + mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback); super.onSliceUnpinned(); } @@ -141,12 +141,12 @@ public class NetworkProviderWorker extends WifiScanWorker implements return; } if (SubscriptionManager.isUsableSubscriptionId(defaultDataSubId)) { - mTelephonyManager.unregisterPhoneStateListener(mPhoneStateListener); + mTelephonyManager.unregisterTelephonyCallback(mTelephonyCallback); mMobileDataObserver.unregister(mContext); mSignalStrengthListener.updateSubscriptionIds(Collections.singleton(defaultDataSubId)); mTelephonyManager = mTelephonyManager.createForSubscriptionId(defaultDataSubId); - mTelephonyManager.registerPhoneStateListener(mHandler::post, mPhoneStateListener); + mTelephonyManager.registerTelephonyCallback(mHandler::post, mTelephonyCallback); mMobileDataObserver.register(mContext, mDefaultDataSubid); mConfig = getConfig(mContext); } else { @@ -216,10 +216,10 @@ public class NetworkProviderWorker extends WifiScanWorker implements } } - class NetworkProviderPhoneStateListener extends PhoneStateListener implements - PhoneStateListener.DataConnectionStateChangedListener, - PhoneStateListener.DisplayInfoChangedListener, - PhoneStateListener.ServiceStateChangedListener { + class NetworkProviderTelephonyCallback extends TelephonyCallback implements + TelephonyCallback.DataConnectionStateListener, + TelephonyCallback.DisplayInfoListener, + TelephonyCallback.ServiceStateListener { @Override public void onServiceStateChanged(ServiceState state) { Log.d(TAG, "onServiceStateChanged voiceState=" + state.getState() diff --git a/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java index 06c3edb8478..4d1d319027c 100644 --- a/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java +++ b/src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java @@ -77,7 +77,7 @@ public abstract class CdmaBasePreferenceController extends TelephonyBasePreferen if (mAllowedNetworkTypesListener == null) { mAllowedNetworkTypesListener = new AllowedNetworkTypesListener( mContext.getMainExecutor()); - mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener( + mAllowedNetworkTypesListener.setAllowedNetworkTypesListener( () -> updatePreference()); } } diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java index 19302daec3e..997235c8a0c 100644 --- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java +++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java @@ -81,7 +81,7 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon mUiHandler = new Handler(Looper.getMainLooper()); mAllowedNetworkTypesListener = new AllowedNetworkTypesListener( new HandlerExecutor(mUiHandler)); - mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener( + mAllowedNetworkTypesListener.setAllowedNetworkTypesListener( () -> updatePreference()); } diff --git a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java index 1b77c6dd309..cdeb1e58fb9 100644 --- a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java +++ b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java @@ -60,7 +60,7 @@ public class OpenNetworkSelectPagePreferenceController extends mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; mAllowedNetworkTypesListener = new AllowedNetworkTypesListener( context.getMainExecutor()); - mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener( + mAllowedNetworkTypesListener.setAllowedNetworkTypesListener( () -> updatePreference()); } diff --git a/tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java b/tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java index 3387368e64a..d8f3c783fe7 100644 --- a/tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java +++ b/tests/unit/src/com/android/settings/network/AllowedNetworkTypesListenerTest.java @@ -25,8 +25,8 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.HandlerExecutor; -import android.telephony.PhoneStateListener; import android.telephony.RadioAccessFamily; +import android.telephony.TelephonyCallback; import android.telephony.TelephonyManager; import android.test.mock.MockContentResolver; @@ -53,7 +53,7 @@ public class AllowedNetworkTypesListenerTest { private AllowedNetworkTypesListener mAllowedNetworkTypesListener; @Mock - private AllowedNetworkTypesListener.OnAllowedNetworkTypesChangedListener mListener; + private AllowedNetworkTypesListener.OnAllowedNetworkTypesListener mListener; @Mock private TelephonyManager mTelephonyManager; @@ -87,15 +87,15 @@ public class AllowedNetworkTypesListenerTest { public void register_shouldRegisterContentObserver() { mAllowedNetworkTypesListener.register(mContext, SUB_ID); - verify(mTelephonyManager, times(1)).registerPhoneStateListener(any(HandlerExecutor.class), - any(PhoneStateListener.class)); + verify(mTelephonyManager, times(1)).registerTelephonyCallback(any(HandlerExecutor.class), + any(TelephonyCallback.class)); } @Test public void unregister_shouldUnregisterContentObserver() { mAllowedNetworkTypesListener.unregister(mContext, SUB_ID); - verify(mTelephonyManager).unregisterPhoneStateListener( + verify(mTelephonyManager).unregisterTelephonyCallback( mAllowedNetworkTypesListener); } } diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java index 2ce9a513daf..97f8e11f796 100644 --- a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java @@ -207,22 +207,22 @@ public class NetworkProviderWorkerTest { @Test @UiThreadTest - public void onServiceStateChanged_notifyPhoneStateListener_callUpdateSlice() { + public void onServiceStateChanged_notifyTelephonyCallback_callUpdateSlice() { mMockNetworkProviderWorker.onSlicePinned(); mMockNetworkProviderWorker.receiveNotification(false); - mMockNetworkProviderWorker.mPhoneStateListener.onServiceStateChanged(new ServiceState()); + mMockNetworkProviderWorker.mTelephonyCallback.onServiceStateChanged(new ServiceState()); assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue(); } @Test @UiThreadTest - public void onDisplayInfoChanged_notifyPhoneStateListener_callUpdateSlice() { + public void onDisplayInfoChanged_notifyTelephonyCallback_callUpdateSlice() { mMockNetworkProviderWorker.onSlicePinned(); mMockNetworkProviderWorker.receiveNotification(false); - mMockNetworkProviderWorker.mPhoneStateListener.onDisplayInfoChanged( + mMockNetworkProviderWorker.mTelephonyCallback.onDisplayInfoChanged( new TelephonyDisplayInfo(14, 0)); assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue(); @@ -230,11 +230,11 @@ public class NetworkProviderWorkerTest { @Test @UiThreadTest - public void onDataConnectionStateChanged_notifyPhoneStateListener_callUpdateSlice() { + public void onDataConnectionStateChanged_notifyTelephonyCallback_callUpdateSlice() { mMockNetworkProviderWorker.onSlicePinned(); mMockNetworkProviderWorker.receiveNotification(false); - mMockNetworkProviderWorker.mPhoneStateListener.onDataConnectionStateChanged( + mMockNetworkProviderWorker.mTelephonyCallback.onDataConnectionStateChanged( TelephonyManager.DATA_DISCONNECTED, TelephonyManager.NETWORK_TYPE_LTE); assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();