Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" (9abf2bff) · 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
		@@ -145,7 +145,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/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());
		}
		}

src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
		mUiHandler = new Handler(Looper.getMainLooper());
		mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(
		new HandlerExecutor(mUiHandler));
		mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(
		mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(
		() -> updatePreference());
		}