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

Commit bae5889d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add logic for 5G icon to SIM status dialog" into rvc-dev am: 73bf0374 

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

Change-Id: I4bd6cc79c6188c26ee233306e3979ba9d7806329
parents 2cdf49c4 73bf0374

src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java

+22 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.telephony.SignalStrength; 
import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.TelephonyDisplayInfo;

import android.telephony.TelephonyManager;

import android.telephony.UiccCardInfo;

import android.telephony.euicc.EuiccManager;
@@ -138,6 +139,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
            };



    private SubscriptionInfo mSubscriptionInfo;

    private TelephonyDisplayInfo mTelephonyDisplayInfo;



    private final int mSlotIndex;

    private TelephonyManager mTelephonyManager;
@@ -269,7 +271,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        mTelephonyManager.listen(mPhoneStateListener,

                PhoneStateListener.LISTEN_DATA_CONNECTION_STATE

                        | PhoneStateListener.LISTEN_SIGNAL_STRENGTHS

                        | PhoneStateListener.LISTEN_SERVICE_STATE);

                        | PhoneStateListener.LISTEN_SERVICE_STATE

                        | PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED);

        mSubscriptionManager.addOnSubscriptionsChangedListener(

                mContext.getMainExecutor(), mOnSubscriptionsChangedListener);

        registerImsRegistrationCallback(mSubscriptionInfo.getSubscriptionId());
@@ -493,6 +496,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
    }



    private void updateNetworkType() {

        // TODO: all of this should be based on TelephonyDisplayInfo instead of just the 5G logic

        if (mSubscriptionInfo == null) {

            final String unknownNetworkType =

                    getNetworkTypeName(TelephonyManager.NETWORK_TYPE_UNKNOWN);
@@ -507,6 +511,10 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        final int subId = mSubscriptionInfo.getSubscriptionId();

        final int actualDataNetworkType = mTelephonyManager.getDataNetworkType();

        final int actualVoiceNetworkType = mTelephonyManager.getVoiceNetworkType();

        final int overrideNetworkType = mTelephonyDisplayInfo == null

                ? TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NONE

                : mTelephonyDisplayInfo.getOverrideNetworkType();



        if (TelephonyManager.NETWORK_TYPE_UNKNOWN != actualDataNetworkType) {

            dataNetworkTypeName = getNetworkTypeName(actualDataNetworkType);

        }
@@ -514,6 +522,12 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
            voiceNetworkTypeName = getNetworkTypeName(actualVoiceNetworkType);

        }



        if (overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA_MMWAVE

                || overrideNetworkType == TelephonyDisplayInfo.OVERRIDE_NETWORK_TYPE_NR_NSA) {

            dataNetworkTypeName = "NR NSA";

            voiceNetworkTypeName = "NR NSA";

        }



        boolean show4GForLTE = false;

        final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);

        if (carrierConfig != null) {
@@ -743,6 +757,12 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
                updateServiceState(serviceState);

                updateRoamingStatus(serviceState);

            }



            @Override

            public void onDisplayInfoChanged(@NonNull TelephonyDisplayInfo displayInfo) {

                mTelephonyDisplayInfo = displayInfo;

                updateNetworkType();

            }

        };

    }
@@ -788,7 +808,7 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
//          case TelephonyManager.NETWORK_TYPE_LTE_CA:

//              return "LTE_CA";

            case TelephonyManager.NETWORK_TYPE_NR:

                return "NR";

                return "NR SA";

            default:

                return "UNKNOWN";

        }