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

Commit 67805d8e authored by Bonian Chen's avatar Bonian Chen Committed by Gerrit Code Review
Browse files

Merge "[Setting] Fix merge conflict"

parents 45b03edd dfba6f87

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

+11 −10
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ import android.os.Bundle; 
import android.os.PersistableBundle;

import android.os.UserHandle;

import android.telephony.CarrierConfigManager;

import android.telephony.SmsCbMessage;

import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SmsCbMessage;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
@@ -407,7 +407,8 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O 
        final PersistableBundle carrierConfig =

                mCarrierConfigManager.getConfigForSubId(subscriptionId);

        final boolean showImsRegState = carrierConfig == null ? false :

            carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL);

                carrierConfig.getBoolean(

                        CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL);

        if (showImsRegState) {

            final boolean isImsRegistered = mTelephonyManager.isImsRegistered(subscriptionId);

            mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString(isImsRegistered ?

tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java

+23 −37
Original line number Diff line number Diff line
@@ -16,35 +16,21 @@ 


package com.android.settings.deviceinfo.simstatus;



import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .CELL_DATA_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .CELL_VOICE_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_DATA_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_VOICE_NETWORK_TYPE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .ICCID_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .ICCID_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .IMS_REGISTRATION_STATE_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .IMS_REGISTRATION_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .NETWORK_PROVIDER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .OPERATOR_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .OPERATOR_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .PHONE_NUMBER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .ROAMING_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .SERVICE_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .SIGNAL_STRENGTH_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController

        .SIGNAL_STRENGTH_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.NETWORK_PROVIDER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.PHONE_NUMBER_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ROAMING_INFO_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SERVICE_STATE_VALUE_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_LABEL_ID;

import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_VALUE_ID;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;