Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev (d841a36c) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/AllowedNetworkTypesListener.java

+9 −8

Original line number	Diff line number	Diff line
		@@ -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.
		*/

src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ public class EnabledNetworkModePreferenceController extends
		if (mAllowedNetworkTypesListener == null) {
		mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
		mContext.getMainExecutor());
		mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
		mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
		() -> updatePreference());
		}

src/com/android/settings/network/telephony/NetworkPreferenceCategoryController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ public class NetworkPreferenceCategoryController extends PreferenceCategoryContr
		mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
		mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
		context.getMainExecutor());
		mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
		mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
		() -> updatePreference());
		}

src/com/android/settings/network/telephony/NetworkProviderWorker.java

+11 −11

Original line number	Diff line number	Diff line
		@@ -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()

src/com/android/settings/network/telephony/cdma/CdmaBasePreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -77,7 +77,7 @@ public abstract class CdmaBasePreferenceController extends TelephonyBasePreferen
		if (mAllowedNetworkTypesListener == null) {
		mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
		mContext.getMainExecutor());
		mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
		mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
		() -> updatePreference());
		}
		}