Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99887921 authored by Zoey Chen's avatar Zoey Chen Committed by Automerger Merge Worker
Browse files

Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5"... 

Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff am: 6003cb97

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib339b36768196e6e5f676944754d5736937b16cd
parents ebb056fa 6003cb97

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

+9 −8
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.network; 




import android.content.Context;

import android.content.Context;

import android.telephony.PhoneStateListener;

import android.telephony.PhoneStateListener;

import android.telephony.TelephonyCallback;

import android.telephony.TelephonyManager;

import android.telephony.TelephonyManager;

import android.util.Log;

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

public class AllowedNetworkTypesListener extends TelephonyCallback implements

        PhoneStateListener.AllowedNetworkTypesChangedListener {

        TelephonyCallback.AllowedNetworkTypesListener {

    private static final String LOG_TAG = "NetworkModeListener";

    private static final String LOG_TAG = "NetworkModeListener";





    @VisibleForTesting

    @VisibleForTesting

    AllowedNetworkTypesListener.OnAllowedNetworkTypesChangedListener mListener;

    OnAllowedNetworkTypesListener mListener;

    private long mAllowedNetworkType = -1;

    private long mAllowedNetworkType = -1;

    private Executor mExecutor;

    private Executor mExecutor;
@@ -44,7 +45,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements 
        mExecutor = executor;

        mExecutor = executor;

    }

    }





    public void setAllowedNetworkTypesChangedListener(OnAllowedNetworkTypesChangedListener lsn) {

    public void setAllowedNetworkTypesListener(OnAllowedNetworkTypesListener lsn) {

        mListener = lsn;

        mListener = lsn;

    }

    }
@@ -56,7 +57,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements 
    public void register(Context context, int subId) {

    public void register(Context context, int subId) {

        TelephonyManager telephonyManager = context.getSystemService(

        TelephonyManager telephonyManager = context.getSystemService(

                TelephonyManager.class).createForSubscriptionId(subId);

                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) {

    public void unregister(Context context, int subId) {

        TelephonyManager telephonyManager = context.getSystemService(

        TelephonyManager telephonyManager = context.getSystemService(

                TelephonyManager.class).createForSubscriptionId(subId);

                TelephonyManager.class).createForSubscriptionId(subId);

        telephonyManager.unregisterPhoneStateListener(this);

        telephonyManager.unregisterTelephonyCallback(this);

    }

    }





    @Override

    @Override
@@ -84,7 +85,7 @@ public class AllowedNetworkTypesListener extends PhoneStateListener implements 
    /**

    /**

     * Listener for update of Preferred Network Mode change

     * Listener for update of Preferred Network Mode change

     */

     */

    public interface OnAllowedNetworkTypesChangedListener {

    public interface OnAllowedNetworkTypesListener {

        /**

        /**

         * Notify the allowed network type changed.

         * Notify the allowed network type changed.

         */

         */

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ public class EnabledNetworkModePreferenceController extends 
        if (mAllowedNetworkTypesListener == null) {

        if (mAllowedNetworkTypesListener == null) {

            mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(

            mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(

                    mContext.getMainExecutor());

                    mContext.getMainExecutor());

            mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(

            mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(

                    () -> updatePreference());

                    () -> updatePreference());

        }

        }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -45,7 +45,7 @@ public class NetworkPreferenceCategoryController extends PreferenceCategoryContr 
        mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

        mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(

        mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(

                context.getMainExecutor());

                context.getMainExecutor());

        mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(

        mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(

                () -> updatePreference());

                () -> updatePreference());

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -77,7 +77,7 @@ public abstract class CdmaBasePreferenceController extends TelephonyBasePreferen 
        if (mAllowedNetworkTypesListener == null) {

        if (mAllowedNetworkTypesListener == null) {

            mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(

            mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(

                    mContext.getMainExecutor());

                    mContext.getMainExecutor());

            mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(

            mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(

                    () -> updatePreference());

                    () -> updatePreference());

        }

        }

    }

    }

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon 
        mUiHandler = new Handler(Looper.getMainLooper());

        mUiHandler = new Handler(Looper.getMainLooper());

        mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(

        mAllowedNetworkTypesListener = new AllowedNetworkTypesListener(

                new HandlerExecutor(mUiHandler));

                new HandlerExecutor(mUiHandler));

        mAllowedNetworkTypesListener.setAllowedNetworkTypesChangedListener(

        mAllowedNetworkTypesListener.setAllowedNetworkTypesListener(

                () -> updatePreference());

                () -> updatePreference());

    }

    }